Update src/virtual-machine.js

src/virtual-machine.js

@@ -20,6 +20,7 @@ const StageLayering = require('./engine/stage-layering');
 const Sprite = require('./sprites/sprite');
 const Blocks = require('./engine/blocks');
 const formatMessage = require('format-message');
+const ExtensionStorage = require('./util/deprecated-extension-storage.js');
 
 const Variable = require('./engine/variable');
 const newBlockIds = require('./util/new-block-ids');
@@ -242,7 +243,7 @@ class VirtualMachine extends EventEmitter {
         this.addListener('workspaceUpdate', () => {
             this.extensionManager.refreshDynamicCategorys();
         });
-        
+
         /**
          * Export some internal classes for extensions.
          */
@@ -259,8 +260,34 @@ class VirtualMachine extends EventEmitter {
             StageLayering,
             Variable,
             Thread: require('./engine/thread.js'),
-            execute: require('./engine/execute.js')
+            execute: require('./engine/execute.js'),
+            centralDispatch
         };
+
+        /**
+         * For comptatibility with TurboWarp's
+         * i_will_not_ask_for_help_when_these_break export.
+         */
+        this.exports.i_will_not_ask_for_help_when_these_break = () => {
+            console.info(
+                'Note on i_will_not_ask_for_help_when_these_break: this function is ' +
+                'only included for compatibility with TurboWarp, and you should avoid ' +
+                'using it when possible.\n' +
+                'All indexes are able to be accessed from the regular vm.exports ' +
+                'property. Below is a map of all elements here to their vm.exports ' +
+                'counterpart:\n' +
+                'IRGenerator -> IRGenerator\nJSGenerator -> JSGenerator\nThread -> Thread\n' +
+                'execute -> execute\n' +
+                'ScriptTreeGenerator -> IRGenerator.exports.ScriptTreeGenerator'
+            );
+            return {
+                IRGenerator,
+                JSGenerator,
+                ScriptTreeGenerator: IRGenerator.exports.ScriptTreeGenerator,
+                Thread: this.exports.Thread,
+                execute: this.exports.execute
+            }
+        }
     }
 
     /**
@@ -471,7 +498,7 @@ class VirtualMachine extends EventEmitter {
                     const decoder = new TextDecoder('UTF-8');
                     input = decoder.decode(input);
                 }
-                if (typeof input === 'string') 
+                if (typeof input === 'string')
                     input = JSON.parse(input);
                 // generic objects return [object Object] on stringify
                 if (input.toString() === '[object Object]') {
@@ -769,19 +796,51 @@ class VirtualMachine extends EventEmitter {
         targets = targets.filter(target => !!target);
 
         return this._loadExtensions(extensions.extensionIDs, extensions.extensionURLs).then(() => {
+            const deprecated_extensionStorage = {};
             for (const extension of extensions.extensionIDs) {
-                if (`ext_${extension}` in this.runtime) {
-                    if ((typeof this.runtime[`ext_${extension}`].deserialize === 'function') && 
-                        extensions.extensionData[extension]) {
-                        this.runtime[`ext_${extension}`].deserialize(extensions.extensionData[extension]);
-                    }
+                if (!extensions.extensionData[extension]) continue;
+                if (
+                    `ext_${extension}` in this.runtime &&
+                    typeof this.runtime[`ext_${extension}`].deserialize === 'function'
+                ) {
+                    this.runtime[`ext_${extension}`].deserialize(extensions.extensionData[extension]);
+                    continue;
                 }
+                deprecated_extensionStorage[extension] = extensions.extensionData[extension];
             }
+            if (deprecated_extensionStorage)
+                this.runtime.extensionStorage = ExtensionStorage(deprecated_extensionStorage);
+
             targets.forEach(target => {
                 this.runtime.addTarget(target);
                 (/** @type RenderedTarget */ target).updateAllDrawableProperties();
                 // Ensure unique sprite name
                 if (target.isSprite()) this.renameSprite(target.id, target.getName());
+
+                if (!("extensionData" in target)) return;
+
+                const deprecated_extensionStorage_pertarget = {};
+
+                for (const extension of extensions.extensionIDs) {
+                    if (!(extension in target.extensionData)) continue;
+
+                    if (
+                        `ext_${extension}` in this.runtime &&
+                        typeof this.runtime[`ext_${extension}`].deserializeForTarget === 'function'
+                    ) {
+                        this.runtime[`ext_${extension}`].deserializeForTarget(
+                            target.extensionData[extension],
+                            target,
+                        );
+                        continue;
+                    }
+                    deprecated_extensionStorage_pertarget[extension] = target.extensionData[extension];
+                }
+
+                if (deprecated_extensionStorage)
+                    target.extensionStorage = ExtensionStorage(deprecated_extensionStorage_pertarget);
+
+                delete target["extensionData"]
             });
             // Sort the executable targets by layerOrder.
             // Remove layerOrder property after use.
@@ -2007,4 +2066,4 @@ class VirtualMachine extends EventEmitter {
     }
 }
 
-module.exports = VirtualMachine;
+module.exports = VirtualMachine;