@turbowarp/sb3fix 0.2.0 → 0.2.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@turbowarp/sb3fix",
-  "version": "0.2.0",
+  "version": "0.2.2",
   "description": "Fix corrupted Scratch projects",
   "main": "src/sb3fix.js",
   "scripts": {

package/src/sb3fix.js

@@ -134,7 +134,7 @@ const fixJSON = (data, options = {}) => {
   /**
    * @param {unknown[]} native
    */
-  const fixNativeInPlace = (native) => {
+  const fixCompressedNativeInPlace = (native) => {
     if (!Array.isArray(native)) {
       throw new Error('native is not an array');
     }
@@ -144,10 +144,13 @@ const fixJSON = (data, options = {}) => {
       throw new Error('native type is not a number');
     }
     switch (type) {
-      case 12: // Variable: [12, variable name, variable id]
-      case 13: // List: [13, list name, list id]
-        if (native.length !== 3) {
-          throw new Error('variable or list native is of wrong length');
+      // 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
+      case 12:
+      case 13: {
+        if (native.length !== 3 && native.length !== 5) {
+          throw new Error(`Variable or list native is of unexpected length: ${native.length}`);
         }
         const name = native[1];
         if (typeof name !== 'string') {
@@ -155,6 +158,7 @@ const fixJSON = (data, options = {}) => {
           native[1] = String(native[1]);
         }
         break;
+      }
     }
   };
 
@@ -164,7 +168,7 @@ const fixJSON = (data, options = {}) => {
    */
   const fixBlockInPlace = (id, block) => {
     if (Array.isArray(block)) {
-      fixNativeInPlace(block);
+      fixCompressedNativeInPlace(block);
     } else if (isObject(block)) {
       const inputs = block.inputs;
       if (!isObject(inputs)) {
@@ -176,7 +180,7 @@ const fixJSON = (data, options = {}) => {
         }
         for (let i = 1; i < input.length; i++) {
           if (Array.isArray(input[i])) {
-            fixNativeInPlace(input[i]);
+            fixCompressedNativeInPlace(input[i]);
           }
         }
       }
@@ -326,23 +330,55 @@ const fixJSON = (data, options = {}) => {
       fixTargetInPlace(target);
     }
 
+    let stage;
     const allStages = targets.filter((target) => target.isStage);
-    if (allStages.length !== 1) {
-      throw new Error(`wrong number of stages: ${allStages.length}`);
-    }
-    const stageIndex = targets.findIndex((target) => target.isStage);
-    // stageIndex guaranteed to not be -1 by earlier check
-    const stage = targets[stageIndex];
-    // stage must be the first target
-    if (stageIndex !== 0) {
-      log('stage was not at start');
-      targets.splice(stageIndex, 1);
+    if (allStages.length === 0) {
+      log('stage is missing; adding an empty one');
+      stage = {
+        isStage: true,
+        name: 'Stage',
+        variables: {},
+        lists: {},
+        broadcasts: {},
+        blocks: {},
+        currentCostume: 0,
+        costumes: [
+          {
+            name: 'backdrop1',
+            dataFormat: 'svg',
+            assetId: 'cd21514d0531fdffb22204e0ec5ed84a',
+            md5ext: 'cd21514d0531fdffb22204e0ec5ed84a.svg',
+            rotationCenterX: 240,
+            rotationCenterY: 180
+          }
+        ],
+        sounds: [],
+        volume: 100,
+        layerOrder: 0,
+        tempo: 60,
+        videoTransparency: 50,
+        videoState: "on",
+        textToSpeechLanguage: null
+      };
       targets.unshift(stage);
+    } else if (allStages.length === 1) {
+      const stageIndex = targets.findIndex((target) => target.isStage);
+      // stageIndex guaranteed to not be -1 by earlier filter check
+      stage = targets[stageIndex];
+      // stage must be the first target
+      if (stageIndex !== 0) {
+        log(`stage was at wrong index: ${stageIndex}`);
+        targets.splice(stageIndex, 1);
+        targets.unshift(stage);
+      }
+    } else {
+      throw new Error(`wrong number of stages: ${allStages.length}`);
     }
+
     // stage's name must match exactly
     if (stage.name !== 'Stage') {
+      log(`stage had wrong name: ${stage.name}`);
       stage.name = 'Stage';
-      log('stage had wrong name');
     }
 
     const knownExtensions = getKnownExtensions(project);