!foo: use jco/pull/254

Author: Hywan

crates/matrix-sdk-extensions/Makefile

@@ -1,9 +1,9 @@
 build-all-guests: build-timeline-guest
 
-build-timeline-guest:
+build-timeline-guest: transpile-timeline-guest-to-js
 	cd guests/timeline && \
 		cargo build --target wasm32-unknown-unknown --release && \
 		wasm-tools component new target/wasm32-unknown-unknown/release/timeline.wasm -o ../../timeline.wasm
 
 transpile-timeline-guest-to-js:
-	 jco transpile --instantiation --optimize --no-typescript --out-dir guests/timeline/js/ timeline.wasm
+	jco transpile --instantiation sync --optimize --no-typescript --out-dir guests/timeline/js/ timeline.wasm

crates/matrix-sdk-extensions/guests/timeline/js/timeline.d.ts

@@ -1,4 +1,4 @@
-import { MatrixUiTimelineStd } from './interfaces/matrix-ui-timeline-std';
+import { MatrixUiTimelineStd } from './interfaces/matrix-ui-timeline-std.js';
 export interface ImportObject {
   'matrix:ui-timeline/std': typeof MatrixUiTimelineStd,
 }
@@ -11,7 +11,7 @@ export interface Root {
 * returns a map of all the exports of the component.
 *
 * This function is intended to be similar to the
-* `WebAssembly.instantiate` function. The second `imports`
+* `WebAssembly.Instantiate` constructor. The second `imports`
 * argument is the "import object" for wasm, except here it
 * uses component-model-layer types instead of core wasm
 * integers/numbers/etc.
@@ -22,12 +22,12 @@ export interface Root {
 * will be invoked per core wasm module. The caller of this
 * function is responsible for reading the core wasm module
 * identified by `path` and returning its compiled
-* WebAssembly.Module object. This would use `compileStreaming`
-* on the web, for example.
+* `WebAssembly.Module` object. This would use the
+* `WebAssembly.Module` constructor on the web, for example.
 */
 export function instantiate(
-compileCore: (path: string, imports: Record<string, any>) => Promise<WebAssembly.Module>,
+compileCore: (path: string, imports: Record<string, any>) => WebAssembly.Module,
 imports: ImportObject,
-instantiateCore?: (module: WebAssembly.Module, imports: Record<string, any>) => Promise<WebAssembly.Instance>
-): Promise<Root>;
+instantiateCore?: (module: WebAssembly.Module, imports: Record<string, any>) => WebAssembly.Instance
+): Root;
 

crates/matrix-sdk-extensions/guests/timeline/js/timeline.js

@@ -1,3 +1,5 @@
+const instantiateCore = WebAssembly.Instance;
+
 const utf8Decoder = new TextDecoder();
 
 const utf8Encoder = new TextEncoder();
@@ -28,14 +30,15 @@ function utf8Encode(s, realloc, memory) {
   return ptr;
 }
 
-function instantiate(compileCore, imports, instantiateCore = WebAssembly.instantiate) {
+export function instantiate(compileCore, imports, instantiateCore = WebAssembly.Instance) {
   const module0 = compileCore('timeline.core.wasm');
   const module1 = compileCore('timeline.core2.wasm');
   const module2 = compileCore('timeline.core3.wasm');
+  
   const { print } = imports['matrix:ui-timeline/std'];
   let exports0;
   let exports1;
-
+  
   function trampoline0(arg0, arg1) {
     const ptr0 = arg0;
     const len0 = arg1;
@@ -46,10 +49,7 @@ function instantiate(compileCore, imports, instantiateCore = WebAssembly.instant
   let exports2;
   let realloc0;
   const instanceFlags0 = new WebAssembly.Global({ value: "i32", mutable: true }, 3);
-  // Promise.all([module0, module1, module2]).catch(() => {});
-
-  const m = module1;
-  ({ exports: exports0 } = instantiateCore(m /* module1 */));
+  ({ exports: exports0 } = instantiateCore(module1));
   ({ exports: exports1 } = instantiateCore(module0, {
     'matrix:ui-timeline/std': {
       print: exports0['0'],

crates/matrix-sdk-extensions/src/javascriptcore.rs

@@ -86,11 +86,7 @@ where
 
         // Run the script.
         {
-            let timeline_script = fs::read_to_string(js_file)
-                .unwrap()
-                .replace("export async function", "function")
-                .replace(" await ", " ")
-                .replace("(await ", "(");
+            let timeline_script = fs::read_to_string(js_file).unwrap().replace("export ", "");
 
             let _result = evaluate_script(
                 &context,