Integrating multiple changes

extensions/src/common/extension/ExtensionBase.ts

@@ -1,6 +1,5 @@
-import Runtime from "$scratch-vm/engine/runtime";
-
-import { AbstractConstructor, Environment, ExlcudeFirst } from "$common/types";
+import { AbstractConstructor, Environment, ExlcudeFirst, } from "$common/types";
+import { Runtime } from "$common/types/scratch/vm";
 
 export type ExtensionConstructorParams = ConstructorParameters<typeof ConstructableExtension>;
 export type AuxiliaryExtensionInfoParams = ExlcudeFirst<ExtensionConstructorParams>;

extensions/src/common/extension/mixins/base/scratchInfo/index.ts

@@ -4,7 +4,6 @@ import { ArgumentType, BlockType } from "$common/types/enums";
 import { BlockOperation, ValueOf, Menu, ExtensionMetadata, ExtensionBlockMetadata, ExtensionMenuMetadata, DynamicMenu, BlockMetadata, BlockUtilityWithID, } from "$common/types";
 import { registerButtonCallback } from "$common/ui";
 import { isString, typesafeCall, } from "$common/utils";
-import type BlockUtility from "$root/scratch-packages/scratch-vm/src/engine/block-utility";
 import { menuProbe, asStaticMenu, getMenuName, convertMenuItemsToString } from "./menus";
 import { Handler } from "./handlers";
 import { BlockDefinition, getButtonID, isBlockGetter } from "./util";

extensions/src/common/package.json

@@ -11,5 +11,7 @@
   },
   "author": "",
   "license": "ISC",
-  "devDependencies": {  }
-}
+  "devDependencies": {
+    "@types/events": "^3.0.3"
+  }
+}

extensions/src/common/types/framework/index.ts

@@ -1,13 +1,13 @@
 import { Extension } from "$common/extension/GenericExtension";
 import type ExtensionManager from "$scratch-vm/extension-support/extension-manager";
-import type Runtime from "$scratch-vm/engine/runtime";
 import type BlockUtility from "$scratch-vm/engine/block-utility";
 import type { blockIDKey } from "../../globals";
 import { ExtensionBlocks } from "./blocks";
 import { Language } from "../enums";
 import { MethodNames, ValueOf } from "../utils";
 import { ExtensionInstance } from "$common/extension";
 import { Tag } from "./tags";
+import { Runtime } from "../scratch/vm";
 
 export type BaseGenericExtension = Extension<ExtensionMenuDisplayDetails, ExtensionBlocks>;
 

extensions/src/common/types/scratch/vm.ts

@@ -1,4 +1,5 @@
 import type * as VmRuntime from "$scratch-vm/engine/runtime";
 import { AudioEngine } from "./audio";
+import type { EventEmitter } from "events";
 
-export type Runtime = Omit<VmRuntime, "audioEngine"> & { audioEngine: AudioEngine };
+export type Runtime = Omit<VmRuntime, "audioEngine"> & { audioEngine: AudioEngine } & EventEmitter;

extensions/src/simple_example/index.ts

@@ -139,4 +139,10 @@ export default class SimpleTypescript extends extension(details, "ui", "customSa
     console.log(blockID);
     return lhs + 5 - rhs;
   }
+
+  @(scratch.reporter`Sample ${"string"} async`)
+  sampleAsync(x: number, y: number) {
+    //await new Promise((resolve) => setTimeout(resolve, 1000));
+    return 5;
+  }
 }

extensions/src/tsconfig.json

@@ -14,7 +14,8 @@
     "lib": [
       "dom",
       "es6",
-      "dom.iterable"
+      "dom.iterable",
+      "ESNext"
     ]
   },
   "include": [