Merge upstream

.github/workflows/node.js.yml

@@ -19,4 +19,3 @@ jobs:
       - run: npm ci
       - run: npm run lint
       - run: npm run build
-      - run: npm run test

package.json

@@ -25,7 +25,8 @@
     "tap:integration": "tap ./test/integration/*.js",
     "test": "npm run lint && npm run tap",
     "watch": "webpack --progress --colors --watch",
-    "version": "json -f package.json -I -e \"this.repository.sha = '$(git log -n1 --pretty=format:%H)'\""
+    "version": "json -f package.json -I -e \"this.repository.sha = '$(git log -n1 --pretty=format:%H)'\"",
+    "update": "node scripts/updatedeps.mjs"
   },
   "tap": {
     "branches": 60,
@@ -47,7 +48,8 @@
     "format-message": "6.2.1",
     "htmlparser2": "3.10.0",
     "immutable": "3.8.2",
-    "scratch-parser": "github:TurboWarp/scratch-parser#master",
+    "json5": "^2.2.3",
+    "scratch-parser": "github:Unsandboxed/scratch-parser#master",
     "scratch-sb1-converter": "0.2.7",
     "scratch-translate-extension-languages": "0.0.20191118205314",
     "text-encoding": "0.7.0",
@@ -65,6 +67,7 @@
     "babel-loader": "8.2.2",
     "callsite": "1.0.0",
     "copy-webpack-plugin": "4.5.4",
+    "depended": "github:Unsandboxed/depended#main",
     "docdash": "1.2.0",
     "eslint": "8.55.0",
     "eslint-config-scratch": "9.0.3",

scripts/updatedeps.mjs

@@ -0,0 +1,4 @@
+import { v } from 'depended';
+v.updateDeps([
+  ['scratch-parser', 'develop']
+]);

src/blocks/scratch3_camera.js

@@ -0,0 +1,85 @@
+const Cast = require('../util/cast');
+
+class Scratch3CameraBlocks {
+    constructor (runtime) {
+        /**
+         * The runtime instantiating this block package.
+         * @type {Runtime}
+         */
+        this.runtime = runtime;
+    }
+
+    getMonitored () {
+        return {
+            camera_xposition: {
+                getId: () => 'xposition'
+            },
+            camera_yposition: {
+                getId: () => 'yposition'
+            }
+        };
+    }
+
+    /**
+     * Retrieve the block primitives implemented by this package.
+     * @return {object.<string, Function>} Mapping of opcode to Function.
+     */
+    getPrimitives () {
+        return {
+            camera_movetoxy: this.moveToXY,
+            camera_changebyxy: this.changeByXY,
+            camera_setx: this.setX,
+            camera_changex: this.changeX,
+            camera_sety: this.setY,
+            camera_changey: this.changeY,
+            camera_xposition: this.getCameraX,
+            camera_yposition: this.getCameraY
+        };
+    }
+
+    moveToXY (args) {
+        const x = Cast.toNumber(args.X);
+        const y = Cast.toNumber(args.Y);
+        this.runtime.camera.setXY(x, y);
+    }
+
+    changeByXY (args) {
+        const x = Cast.toNumber(args.X);
+        const y = Cast.toNumber(args.Y);
+        const newX = x + this.runtime.camera.x;
+        const newY = y + this.runtime.camera.y;
+        this.runtime.camera.setXY(newX, newY);
+    }
+
+    setX (args) {
+        const x = Cast.toNumber(args.X);
+        this.runtime.camera.setXY(x, this.runtime.camera.y);
+    }
+
+    changeX (args) {
+        const x = Cast.toNumber(args.X);
+        const newX = x + this.runtime.camera.x;
+        this.runtime.camera.setXY(newX, this.runtime.camera.y);
+    }
+
+    setY (args) {
+        const y = Cast.toNumber(args.Y);
+        this.runtime.camera.setXY(this.runtime.camera.x, y);
+    }
+
+    changeY (args) {
+        const y = Cast.toNumber(args.Y);
+        const newY = y + this.runtime.camera.y;
+        this.runtime.camera.setXY(this.runtime.camera.x, newY);
+    }
+
+    getCameraX () {
+        return this.runtime.camera.x;
+    }
+
+    getCameraY () {
+        return this.runtime.camera.y;
+    }
+}
+
+module.exports = Scratch3CameraBlocks;

src/blocks/scratch3_control.js

@@ -33,6 +33,8 @@ class Scratch3ControlBlocks {
             control_if: this.if,
             control_if_else: this.ifElse,
             control_stop: this.stop,
+            control_break: this.break,
+            control_continue: this.continue,
             control_create_clone_of: this.createClone,
             control_delete_this_clone: this.deleteClone,
             control_get_counter: this.getCounter,
@@ -149,6 +151,14 @@ class Scratch3ControlBlocks {
         }
     }
 
+    break (_, util) {
+        util.thread.breakCurrentLoop();
+    }
+
+    continue (_, util) {
+        util.thread.continueCurrentLoop();
+    }
+
     createClone (args, util) {
         this._createClone(Cast.toString(args.CLONE_OPTION), util.target);
     }
@@ -193,13 +203,13 @@ class Scratch3ControlBlocks {
     }
 
     allAtOnce (args, util) {
-        // Since the "all at once" block is implemented for compatiblity with
-        // Scratch 2.0 projects, it behaves the same way it did in 2.0, which
-        // is to simply run the contained script (like "if 1 = 1").
-        // (In early versions of Scratch 2.0, it would work the same way as
-        // "run without screen refresh" custom blocks do now, but this was
-        // removed before the release of 2.0.)
+        // In Scratch 3.0 and TurboWarp, this would simply
+        // run the contained substack. In Unsandboxed,
+        // we've reimplemented the intended functionality
+        // of running the stack all in one frame.
+        util.thread.peekStackFrame().warpMode = false;
         util.startBranch(1, false);
+        util.thread.peekStackFrame().warpMode = true;
     }
 }