wasm append output

Author: lamb

.github/workflows/ci.yaml

@@ -16,7 +16,25 @@ jobs:
       - name: Setup Node
         uses: actions/setup-node@v4
         with:
-          node-version: 18.x
+          node-version: 22.x
+      - name: Cache Cargo
+        uses: actions/cache@v4
+        with:
+          path: |
+            ~/.cargo/registry/index/
+            ~/.cargo/registry/cache/
+            ~/.cargo/git/db/
+            target/
+            !./target/*/*/*.zip
+            !./target/*/*/*.tar.gz
+          key: ${{ matrix.target }}-cargo-${{ hashFiles('**/Cargo.toml') }}
+      - name: Update Rust Toolchain
+        run: |
+          rustup update stable
+          rustup component add rustfmt rust-src clippy
+          rustup target add aarch64-apple-darwin
+          rustup target add wasm32-unknown-unknown
+          cargo install wasm-pack --force
       - name: Install Dependencies
         run: npm install
       - name: Package Extension

Cargo.toml

@@ -11,11 +11,8 @@ edition = "2021"
 [lib]
 crate-type = ["cdylib"]
 
-[build]
-target = "wasm32-unknown-unknown"
-
 [dependencies]
-lib = { path = "../core/lib", features = ["wasm"]  }
+lib = { git = "https://github.com/basjoofan/core", tag = "v0.1.0", features = ["wasm"]  }
 wasm-bindgen = "0.2.104"
 wasm-bindgen-futures = "0.4.54"
 

language-configuration.json language/configuration.jsonlanguage-configuration.json renamed to language/configuration.json

@@ -1,5 +1,5 @@
 {
-  "name": "Basjoofan",
+  "name": "basjoofan",
   "scopeName": "source",
   "patterns": [
     {
@@ -23,7 +23,7 @@
       "patterns": [
         {
           "name": "keyword.control",
-          "match": "\\b(fn|rq|let|if|else|return|while|for)\\b"
+          "match": "\\b(test|fn|rq|let|if|else|return|while|for)\\b"
         }
       ]
     },

syntaxes/language.json language/syntaxes.jsonsyntaxes/language.json renamed to language/syntaxes.json

@@ -29,7 +29,7 @@
     "compile": "tsc -p ./",
     "lint": "eslint \"src/**/*.ts\"",
     "watch": "tsc -watch -p ./",
-    "wasm:pack": "wasm-pack build --target nodejs --out-dir ./node_modules/lib",
+    "wasm:pack": "wasm-pack build --target nodejs --out-dir ./node_modules/lib --release",
     "package": "vsce package"
   },
   "devDependencies": {
@@ -52,7 +52,7 @@
         "extensions": [
           ".fan"
         ],
-        "configuration": "language-configuration.json",
+        "configuration": "language/configuration.json",
         "icon": {
           "light": "icons/file.png",
           "dark": "icons/file.png"
@@ -63,7 +63,7 @@
       {
         "language": "basjoofan",
         "scopeName": "source",
-        "path": "syntaxes/language.json"
+        "path": "language/syntaxes.json"
       }
     ]
   }

package.json

@@ -47,10 +47,12 @@ test post {
 
 test postForm {
     let response = postForm->;
-    response.status
+    let status = response.status
+    println("status: {status}")
 }
 
 test postMultipart {
     let response = postMultipart->;
-    response
+    let body = response.body
+    println("body: {body}")
 }

sample/test/test.fan

@@ -2,10 +2,9 @@ import * as vscode from 'vscode';
 import { run_test } from 'lib';
 
 export async function activate(context: vscode.ExtensionContext) {
-  Object.assign(globalThis, {
+  Object.assign(global, {
     readFileContent: async function (filePath: string): Promise<Uint8Array> {
-      const content = await vscode.workspace.fs.readFile(vscode.Uri.file(filePath));
-      return content;
+      return await vscode.workspace.fs.readFile(vscode.Uri.file(filePath));
     }
   });
   const ctrl = vscode.tests.createTestController('BasjoofanTestController', 'Basjoofan');
@@ -65,19 +64,9 @@ export async function activate(context: vscode.ExtensionContext) {
       }
     };
 
-    const appendOutput = (chunk: string) => {
-      for (; ;) {
-        const index = chunk.indexOf('\n');
-        if (index === -1) break;
-        const line = chunk.substring(0, index);
-        chunk = chunk.substring(index + 1);
-        run.appendOutput(`${line}\r\n`);
-      }
-    };
-
     const runTestQueue = async () => {
       for (const test of queue) {
-        run.appendOutput(`Running ${test.uri} ${test.label}\r\n`);
+        run.appendOutput(`Running ${test.uri} ${test.label}\r\n`, undefined, test);
         if (run.token.isCancellationRequested) {
           run.skipped(test);
         } else {
@@ -91,6 +80,16 @@ export async function activate(context: vscode.ExtensionContext) {
               text += await vscode.workspace.openTextDocument(file).then(doc => doc.getText());
             }
           }
+          const appendOutput = (chunk: string): void => {
+            for (; ;) {
+              const index = chunk.indexOf('\n');
+              if (index === -1) break;
+              const line = chunk.substring(0, index);
+              chunk = chunk.substring(index + 1);
+              run.appendOutput(`${line}\r\n`, undefined, test);
+            }
+          };
+          Object.assign(global, { appendOutput: appendOutput });
           const flag = await new Promise<boolean>(resolve => {
             run_test(text, test.label, workspace!.uri.fsPath).then(result => {
               appendOutput(result);