@turbowarp/sb3fix 0.3.4 → 0.3.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@turbowarp/sb3fix",
-  "version": "0.3.4",
+  "version": "0.3.6",
   "description": "Fix corrupted Scratch projects",
   "main": "src/sb3fix.js",
   "scripts": {
@@ -24,8 +24,8 @@
     "@turbowarp/jszip": "^3.11.1"
   },
   "devDependencies": {
-    "copy-webpack-plugin": "^12.0.2",
-    "webpack": "^5.96.1",
-    "webpack-cli": "^5.1.4"
+    "copy-webpack-plugin": "^13.0.0",
+    "webpack": "^5.98.0",
+    "webpack-cli": "^6.0.1"
   }
 }

package/src/sb3fix.js

@@ -1,7 +1,7 @@
 /*!
 sb3fix - https://github.com/TurboWarp/sb3fix
 
-Copyright (C) 2023-2024 Thomas Weber
+Copyright (C) 2023-2025 Thomas Weber
 
 This Source Code Form is subject to the terms of the Mozilla Public
 License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -143,7 +143,55 @@ const fixJSON = (data, options = {}) => {
     if (typeof type !== 'number') {
       throw new Error('native type is not a number');
     }
+
     switch (type) {
+      // Number primitive: [4, string|number]
+      // Positive number primitive: [5, string|number]
+      // Whole number primitive: [6, string|number]
+      // Integer primitive: [7, string|number]
+      // Angle primitive: [8, string|number]
+      case 4:
+      case 5:
+      case 6:
+      case 7:
+      case 8: {
+        if (native.length !== 2) {
+          throw new Error(`Number native is of unexpected length: ${native.length}`);
+        }
+        const value = native[1];
+        if (typeof value !== 'string' && typeof value !== 'number') {
+          log('number native had invalid value');
+          native[1] = String(value);
+        }
+        break;
+      }
+
+      // Color: [9, hex color]
+      case 9: {
+        if (native.length !== 2) {
+          throw new Error(`Color native is of unexpected length: ${native.length}`);
+        }
+        const color = native[1];
+        if (typeof color !== 'string' || !/^#[a-f0-9]{6}$/i.test(color)) {
+          log('color native had invalid value');
+          native[1] = '#000000';
+        }
+        break;
+      }
+
+      // Text: [10, string|number]
+      case 10: {
+        if (native.length !== 2) {
+          throw new Error(`Text native is of unexpected length: ${native.length}`);
+        }
+        const value = native[1];
+        if (typeof value !== 'string' && typeof value !== 'number') {
+          log('text native had invalid value');
+          native[1] = String(value);
+        }
+        break;
+      }
+
       // Variable: [12, variable name, variable id, x?, y?]
       // List: [13, list name, list id, x?, y?]
       // x and y only present if the native is a top-level block
@@ -355,6 +403,20 @@ const fixJSON = (data, options = {}) => {
       log(`sprite had invalid rotation style ${target.rotationStyle}`);
       target.rotationStyle = 'all around';
     }
+
+    if (!target.isStage) {
+      const x = target.x;
+      if (typeof x !== 'number') {
+        log(`target x was ${typeof x}: ${x}`);
+        target.x = +x || 0;
+      }
+  
+      const y = target.y;
+      if (typeof y !== 'number') {
+        log(`target y was ${typeof y}: ${y}`);
+        target.y = +y || 0;
+      }
+    }
   };
 
   /**