Merge branch 'prove' of github.com:CoderDojoTrento/botch-vm into prove

CoderDojoTrento · Aug 18, 2020 · e87467c · e87467c
2 parents 2377f01 + 30fa303
commit e87467c
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 6 deletions.
diff --git a/src/extensions/botch/botch-storage-helper.js b/src/extensions/botch/botch-storage-helper.js
@@ -64,8 +64,11 @@ class BotchStorageHelper extends Helper {
 
         /**
          * In-memory storage for Botch assets
-         * @type {Object.<AssetType, AssetIdMap>} Maps asset type to a map of asset ID to actual assets.
-         * @typedef {Object.<string, BuiltinAssetRecord>} AssetIdMap - Maps asset ID to asset.
+         *
+         * Maps asset type to a map of asset ID to actual assets.
+         * @type {Object.<AssetType, AssetIdMap>}
+         * Maps asset ID to asset.
+         * @typedef {Object.<string, BuiltinAssetRecord>} AssetIdMap
          */
         this.assets = {};
 
@@ -179,7 +182,7 @@ class BotchStorageHelper extends Helper {
     /**
      * Returns a list with all the tags of the sprites
      *
-     * @returns {[]} list
+     * @returns {object[]} list
      * @since botch 0.1
      */
     getAllTags () {

diff --git a/src/extensions/botch/index.js b/src/extensions/botch/index.js
@@ -45,16 +45,27 @@ class Scratch3Botch {
             log.log('Botch: on PROJECT_LOADED');
             this.storage = this.runtime.storage;
             if (!this.storageHelper){
-                this.storageHelper = new BotchStorageHelper(this.runtime.storage);
-                this.storage.addHelper(this.storageHelper);
+                // in some tests it is not defined ...
+                if (this.storage && this.storage.addHelper){
+                    this.storageHelper = new BotchStorageHelper(this.runtime.storage);
+                    this.storage.addHelper(this.storageHelper);
+                } else {
+                    log.log('this.runtime.storage is not defined, skipping BotchStorageHelper initialization');
+                }
+
             }
             // this.testStoreSprite();
         }));
 
         log.log('Botch runtime:', runtime);
         log.log('Botch custom storageHelper:', this.storageHelper);
 
-        window.BOTCH = this;
+        // browser detection arcana https://stackoverflow.com/a/41863502
+        if (this.window === this){
+            window.BOTCH = this; // browser
+        } else {
+            global.BOTCH = this; // node
+        }
 
         // show the organism when stopped
         this.runtime.on(Runtime.PROJECT_STOP_ALL, (() => {
@@ -796,6 +807,14 @@ class Scratch3Botch {
                         for (const cost of sprite.costumes){
                             // NOTE 1: in costumes 'md5' field also has '.svg' appended
 
+                            // this way it will have inside the precious encodeDataURI method
+                            cost.asset = new this.storage.Asset(
+                                cost.asset.assetType,
+                                cost.asset.assetId,
+                                cost.asset.dataFormat,
+                                cost.asset.data,
+                                false
+                            );
                             cost.md5ext = cost.md5;
                             // NOTE 2: in preloaded data there is no md5, only md5ext
                             delete cost.md5;