@turbowarp/sb3fix 0.2.2 → 0.3.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@turbowarp/sb3fix",
-  "version": "0.2.2",
+  "version": "0.3.1",
   "description": "Fix corrupted Scratch projects",
   "main": "src/sb3fix.js",
   "scripts": {
@@ -20,7 +20,7 @@
   },
   "homepage": "https://github.com/TurboWarp/sb3fix#readme",
   "dependencies": {
-    "jszip": "^3.10.1"
+    "@turbowarp/jszip": "^3.11.0"
   },
   "devDependencies": {
     "copy-webpack-plugin": "^12.0.2",

package/src/sb3fix.js

@@ -218,6 +218,20 @@ const fixJSON = (data, options = {}) => {
         costume.name = String(costume.name);
       }
 
+      // https://github.com/scratchfoundation/scratch-parser/blob/665f05d739a202d565a4af70a201909393d456b2/lib/sb3_definitions.json#L51
+      const knownDataFormats = ['png', 'svg', 'jpeg', 'jpg', 'bmp', 'gif'];
+      if (!knownDataFormats.includes(costume.dataFormat)) {
+        if (typeof costume.md5ext === 'string' && costume.md5ext.endsWith('.svg')) {
+          log(`costume ${i} is vector, had invalid dataFormat ${costume.dataFormat}`);
+          costume.dataFormat = 'svg';
+        } else {
+          log(`costume ${i} is bitmap, had invalid dataFormat ${costume.dataFormat}`);
+          // dataFormat is only really used to detect vector or bitmap, so we don't
+          // need to set this to the real format
+          costume.dataFormat = 'png';
+        }
+      }
+
       if (!('assetId' in costume)) {
         log(`costume ${i} was missing assetId, deleted`);
         costumes.splice(i, 1);
@@ -421,7 +435,7 @@ const fixJSON = (data, options = {}) => {
  */
 const fixZip = async (data, options = {}) => {
   // JSZip is not a small library, so we'll load it somewhat lazily.
-  const JSZip = require('jszip');
+  const JSZip = require('@turbowarp/jszip');
 
   const zip = await JSZip.loadAsync(data);