✨ feat: scratch-block extension support

Signed-off-by: SimonShiki <[email protected]>
EurekaScratch · Feb 4, 2024 · 0413e22 · 0413e22
1 parent 2a9d95a
commit 0413e22
Show file tree

Hide file tree

Showing 5 changed files with 183 additions and 160 deletions.
diff --git a/package.json b/package.json
@@ -26,7 +26,7 @@
     "eslint": "^8.49.0",
     "html-webpack-plugin": "^5.5.3",
     "mini-svg-data-uri": "^1.4.4",
-    "typescript": "^5.2.2",
+    "typescript": "^5.3.0",
     "webpack": "^5.88.2",
     "webpack-cli": "^5.1.4",
     "webpack-dev-server": "^4.15.1",

diff --git a/src/loader/loader.ts b/src/loader/loader.ts
@@ -604,8 +604,19 @@ class EurekaLoader {
                             info: blockInfo,
                             xml: blockInfo.xml
                         };
-                    default:
+                    default: {
+                        if ('extensions' in blockInfo) {
+                            const converted = origConvertFunc.call(this, blockInfo, categoryInfo, ...args);
+                            for (const extension of blockInfo.extensions!) {
+                                if (!('extensions' in converted.json)) converted.json = [/*'scratch_extension'*/];
+                                if (!converted.json.extensions.includes(extension)) {
+                                    converted.json.extensions.push(extension);
+                                }
+                            }
+                            return converted;
+                        }
                         return origConvertFunc.call(this, blockInfo, categoryInfo, ...args);
+                    }
                 }
             }
             return origConvertFunc.call(this, blockInfo, categoryInfo, ...args);

diff --git a/src/typings/block-type.ts b/src/typings/block-type.ts
@@ -31,6 +31,7 @@ enum BlockType {
     HAT = 'hat',
     /**
      * A text label (not an actual block) for adding comments or labling blocks
+     * (TurboWarp specific)
      */
     LABEL = 'label',
     /**
@@ -44,6 +45,7 @@ enum BlockType {
     REPORTER = 'reporter',
     /**
      * Arbitrary scratch-blocks XML.
+     * (TurboWarp specific)
      */
      XML = 'xml'
 }

diff --git a/src/typings/extension-metadata.ts b/src/typings/extension-metadata.ts
@@ -197,8 +197,14 @@ export interface ExtensionBlockMetadata {
     filter?: TargetType[];
     /**
      * Arbitrary scratch-blocks XML string.
+     * (TurboWarp specific)
      */
     xml?: string;
+    /**
+     * List of scratch-blocks extensions to use.
+     * (TurboWarp specific)
+     */
+    extensions?: string[];
 }
 
 export interface ExtensionArgumentMetadata {