Merge branch 'TurboWarp:develop' into Shadow-Arguments

src/compiler/compile.js

@@ -1,4 +1,4 @@
-const IRGenerator = require('./irgen');
+const {IRGenerator} = require('./irgen');
 const JSGenerator = require('./jsgen');
 
 const compile = thread => {

src/compiler/irgen.js

@@ -1693,4 +1693,7 @@ class IRGenerator {
     }
 }
 
-module.exports = IRGenerator;
+module.exports = {
+    ScriptTreeGenerator,
+    IRGenerator
+};

src/engine/thread.js

@@ -514,4 +514,7 @@ class Thread {
     }
 }
 
+// for extensions
+Thread._StackFrame = _StackFrame;
+
 module.exports = Thread;

src/extensions/scratch3_pen/index.js

@@ -298,6 +298,16 @@ class Scratch3PenBlocks {
             }),
             blockIconURI: blockIconURI,
             blocks: [
+                // tw: additional message when on the stage for clarity
+                {
+                    blockType: BlockType.LABEL,
+                    text: formatMessage({
+                        id: 'tw.pen.stageSelected',
+                        default: 'Stage selected: less pen blocks',
+                        description: 'Label that appears in the Pen category when the stage is selected'
+                    }),
+                    filter: [TargetType.STAGE]
+                },
                 {
                     opcode: 'clear',
                     blockType: BlockType.COMMAND,

src/util/base64-util.js

@@ -20,10 +20,13 @@ class Base64Util {
 
     /**
      * Convert a Uint8Array to a base64 encoded string.
-     * @param {Uint8Array} array - the array to convert.
+     * @param {Uint8Array|Array<number>} array - the array to convert.
      * @return {string} - the base64 encoded string.
      */
     static uint8ArrayToBase64 (array) {
+        if (Array.isArray(array)) {
+            array = new Uint8Array(array);
+        }
         let binary = '';
         const len = array.byteLength;
         for (let i = 0; i < len; i++) {

src/virtual-machine.js

@@ -220,7 +220,17 @@ class VirtualMachine extends EventEmitter {
         this.exports = {
             Sprite,
             RenderedTarget,
-            JSZip
+            JSZip,
+
+            i_will_not_ask_for_help_when_these_break: () => {
+                console.warn('You are using unsupported APIs. WHEN your code breaks, do not expect help.');
+                return ({
+                    JSGenerator: require('./compiler/jsgen.js'),
+                    IRGenerator: require('./compiler/irgen.js').IRGenerator,
+                    ScriptTreeGenerator: require('./compiler/irgen.js').ScriptTreeGenerator,
+                    Thread: require('./engine/thread.js')
+                });
+            }
         };
     }
 

test/integration/tw_block_returning_promise_like.js

@@ -21,13 +21,13 @@ class TestExtension {
         };
     }
     test () {
-        // returns a PromiseLike that calls handler immediately.
+        // returns a PromiseLike that calls handler immediately instead of in next microtask.
         const promise = {
             then (callbackFn) {
                 callbackFn();
                 return promise;
             }
-            // intentionally omit catch() as that is not part of PromiseLike
+            // intentionally omit catch() as that is not part of PromiseLike, so it should not be used
         };
         return promise;
     }
@@ -45,6 +45,10 @@ for (const compilerEnabled of [false, true]) {
         });
         t.equal(vm.runtime.compilerOptions.enabled, compilerEnabled, 'sanity check');
 
+        vm.runtime.on('COMPILE_ERROR', () => {
+            t.fail('Compile error');
+        });
+
         vm.loadProject(fixture).then(() => {
             let ended = 0;
             vm.runtime.on('SAY', (target, type, text) => {

test/unit/tw_sandboxed_extensions.js

@@ -9,6 +9,9 @@ global.fetch = (url, options = {}) => (
     Promise.resolve(`[Response ${url instanceof Request ? url.url : url} options=${JSON.stringify(options)}]`)
 );
 
+// Remove navigator object from Node 21 and later
+delete global.navigator;
+
 // Need to trick the extension API to think it's running in a worker
 // It will not actually use this object ever.
 global.self = {};

test/unit/tw_translate.js

@@ -6,9 +6,12 @@ global.fetch = () => Promise.reject(new Error('Simulated network error'));
 
 const Scratch3TranslateBlocks = require('../../src/extensions/scratch3_translate/index');
 
-global.navigator = {
-    language: 'en'
-};
+// Node 21 and later defines a navigator object, but we want to override that for the test
+Object.defineProperty(global, 'navigator', {
+    value: {
+        language: 'en-US'
+    }
+});
 
 // Translate tries to access AbortController from window, but does not require it to exist.
 global.window = {};

test/unit/tw_unsandboxed_extensions.js

@@ -52,6 +52,9 @@ global.window = {
     open: (url, target, features) => `[Window ${url} target=${target || ''} features=${features || ''}]`
 };
 
+// Remove navigator object from Node 21 and later
+delete global.navigator;
+
 tap.beforeEach(() => {
     scriptCallbacks.clear();
     global.location = {

test/unit/util_base64.js

@@ -3,6 +3,7 @@ const Base64Util = require('../../src/util/base64-util');
 
 test('uint8ArrayToBase64', t => {
     t.equal(Base64Util.uint8ArrayToBase64(new Uint8Array([0, 50, 80, 200])), 'ADJQyA==');
+    t.equal(Base64Util.uint8ArrayToBase64([0, 50, 80, 200]), 'ADJQyA==');
     t.end();
 });
 
@@ -25,11 +26,13 @@ test('round trips', t => {
         new Uint8Array(0),
         new Uint8Array([10, 90, 0, 255, 255, 255, 10, 2]),
         new Uint8Array(10000),
-        new Uint8Array(1000000)
+        new Uint8Array(100000)
     ];
     for (const uint8array of data) {
         const uint8ToBase64 = Base64Util.uint8ArrayToBase64(uint8array);
+        const arrayToBase64 = Base64Util.uint8ArrayToBase64(Array.from(uint8array));
         const bufferToBase64 = Base64Util.arrayBufferToBase64(uint8array.buffer);
+        t.equal(uint8ToBase64, arrayToBase64);
         t.equal(uint8ToBase64, bufferToBase64);
         const decoded = Base64Util.base64ToUint8Array(uint8ToBase64);
         t.same(uint8array, decoded);