Switch to BiomeJS (#306)

src-tauri/tauri.conf.json

@@ -30,46 +30,5 @@
         ]
       }
     }
-  },
-  "bundle": {
-    "publisher": "Yaak",
-    "license": "MIT",
-    "copyright": "Yaak",
-    "homepage": "https://yaak.app",
-    "active": true,
-    "category": "DeveloperTool",
-    "externalBin": [
-      "vendored/node/yaaknode",
-      "vendored/protoc/yaakprotoc"
-    ],
-    "icon": [
-      "icons/release/32x32.png",
-      "icons/release/128x128.png",
-      "icons/release/128x128@2x.png",
-      "icons/release/icon.icns",
-      "icons/release/icon.ico"
-    ],
-    "longDescription": "A cross-platform desktop app for interacting with REST, GraphQL, and gRPC",
-    "resources": [
-      "static",
-      "vendored/protoc/include",
-      "vendored/plugins",
-      "vendored/plugin-runtime"
-    ],
-    "shortDescription": "Play with APIs, intuitively",
-    "targets": [
-      "app",
-      "appimage",
-      "deb",
-      "dmg",
-      "nsis",
-      "rpm"
-    ],
-    "macOS": {
-      "minimumSystemVersion": "13.0",
-      "exceptionDomain": "",
-      "entitlements": "macos/entitlements.plist",
-      "frameworks": []
-    }
   }
 }

src-tauri/tauri.development.conf.json

@@ -2,6 +2,16 @@
   "productName": "Daak",
   "identifier": "app.yaak.desktop.dev",
   "bundle": {
+    "externalBin": [
+      "vendored/node/yaaknode",
+      "vendored/protoc/yaakprotoc"
+    ],
+    "resources": [
+      "static",
+      "vendored/protoc/include",
+      "vendored/plugins",
+      "vendored/plugin-runtime"
+    ],
     "icon": [
       "icons/dev/32x32.png",
       "icons/dev/128x128.png",

src-tauri/tauri.linux.conf.json

@@ -1,13 +1,3 @@
 {
-  "productName": "yaak",
-  "bundle": {
-    "linux": {
-      "deb": {
-        "desktopTemplate": "./template.desktop"
-      },
-      "rpm": {
-        "desktopTemplate": "./template.desktop"
-      }
-    }
-  }
+  "productName": "yaak"
 }

src-tauri/tauri.release.conf.json

@@ -30,9 +30,55 @@
     }
   },
   "bundle": {
-    "createUpdaterArtifacts": true,
+    "publisher": "Yaak",
+    "license": "MIT",
+    "copyright": "Yaak",
+    "homepage": "https://yaak.app",
+    "active": true,
+    "category": "DeveloperTool",
+    "externalBin": [
+      "vendored/node/yaaknode",
+      "vendored/protoc/yaakprotoc"
+    ],
+    "icon": [
+      "icons/release/32x32.png",
+      "icons/release/128x128.png",
+      "icons/release/128x128@2x.png",
+      "icons/release/icon.icns",
+      "icons/release/icon.ico"
+    ],
+    "longDescription": "A cross-platform desktop app for interacting with REST, GraphQL, and gRPC",
+    "resources": [
+      "static",
+      "vendored/protoc/include",
+      "vendored/plugins",
+      "vendored/plugin-runtime"
+    ],
+    "shortDescription": "Play with APIs, intuitively",
+    "targets": [
+      "app",
+      "appimage",
+      "deb",
+      "dmg",
+      "nsis",
+      "rpm"
+    ],
+    "macOS": {
+      "minimumSystemVersion": "13.0",
+      "exceptionDomain": "",
+      "entitlements": "macos/entitlements.plist",
+      "frameworks": []
+    },
     "windows": {
       "signCommand": "trusted-signing-cli -e https://eus.codesigning.azure.net/ -a Yaak -c yaakapp %1"
+    },
+    "linux": {
+      "deb": {
+        "desktopTemplate": "./template.desktop"
+      },
+      "rpm": {
+        "desktopTemplate": "./template.desktop"
+      }
     }
   }
 }

src-tauri/yaak-models/bindings/gen_util.ts

@@ -1,4 +1,4 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { Environment, Folder, GrpcRequest, HttpRequest, WebsocketRequest, Workspace } from "./gen_models.js";
+import type { Environment, Folder, GrpcRequest, HttpRequest, WebsocketRequest, Workspace } from "./gen_models";
 
 export type BatchUpsertResult = { workspaces: Array<Workspace>, environments: Array<Environment>, folders: Array<Folder>, httpRequests: Array<HttpRequest>, grpcRequests: Array<GrpcRequest>, websocketRequests: Array<WebsocketRequest>, };

src-tauri/yaak-plugins/Cargo.toml

@@ -26,7 +26,7 @@ tauri-plugin-shell = { workspace = true }
 thiserror = { workspace = true }
 tokio = { workspace = true, features = ["macros", "rt-multi-thread", "process"] }
 tokio-tungstenite = "0.26.1"
-ts-rs = { workspace = true, features = ["import-esm"] }
+ts-rs = { workspace = true }
 yaak-common = { workspace = true }
 yaak-crypto = { workspace = true }
 yaak-models = { workspace = true }

src-tauri/yaak-plugins/bindings/gen_api.ts

@@ -1,5 +1,5 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { PluginVersion } from "./gen_search.js";
+import type { PluginVersion } from "./gen_search";
 
 export type PluginNameVersion = { name: string, version: string, };
 

src-tauri/yaak-plugins/bindings/gen_events.ts

@@ -1,6 +1,6 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { Environment, Folder, GrpcRequest, HttpRequest, HttpResponse, WebsocketRequest, Workspace } from "./gen_models.js";
-import type { JsonValue } from "./serde_json/JsonValue.js";
+import type { Environment, Folder, GrpcRequest, HttpRequest, HttpResponse, WebsocketRequest, Workspace } from "./gen_models";
+import type { JsonValue } from "./serde_json/JsonValue";
 
 export type BootRequest = { dir: string, watch: boolean, };
 

src-tauri/yaak-sync/bindings/gen_sync.ts

@@ -1,5 +1,5 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { SyncModel, SyncState } from "./gen_models.js";
+import type { SyncModel, SyncState } from "./gen_models";
 
 export type FsCandidate = { "type": "FsCandidate", model: SyncModel, relPath: string, checksum: string, };
 

src-tauri/yaak-templates/package.json

@@ -5,9 +5,12 @@
   "main": "index.ts",
   "scripts": {
     "bootstrap": "npm run build",
-    "build": "wasm-pack build --target bundler"
+    "build": "run-s build:*",
+    "build:pack": "wasm-pack build --target bundler",
+    "build:clean": "rimraf ./pkg/.gitignore"
   },
   "devDependencies": {
-    "wasm-pack": "^0.13.1"
+    "wasm-pack": "^0.13.1",
+    "rimraf": "^6.1.2"
   }
 }

src-tauri/yaak-templates/pkg/package.json

@@ -0,0 +1,17 @@
+{
+  "name": "yaak-templates",
+  "type": "module",
+  "version": "0.1.0",
+  "files": [
+    "yaak_templates_bg.wasm",
+    "yaak_templates.js",
+    "yaak_templates_bg.js",
+    "yaak_templates.d.ts"
+  ],
+  "main": "yaak_templates.js",
+  "types": "yaak_templates.d.ts",
+  "sideEffects": [
+    "./yaak_templates.js",
+    "./snippets/*"
+  ]
+}

src-tauri/yaak-templates/pkg/yaak_templates.d.ts

@@ -0,0 +1,5 @@
+/* tslint:disable */
+/* eslint-disable */
+export function unescape_template(template: string): any;
+export function parse_template(template: string): any;
+export function escape_template(template: string): any;

src-tauri/yaak-templates/pkg/yaak_templates.js

@@ -0,0 +1,4 @@
+import * as wasm from "./yaak_templates_bg.wasm";
+export * from "./yaak_templates_bg.js";
+import { __wbg_set_wasm } from "./yaak_templates_bg.js";
+__wbg_set_wasm(wasm);

src-tauri/yaak-templates/pkg/yaak_templates_bg.js

@@ -0,0 +1,296 @@
+let wasm;
+export function __wbg_set_wasm(val) {
+    wasm = val;
+}
+
+
+const heap = new Array(128).fill(undefined);
+
+heap.push(undefined, null, true, false);
+
+let heap_next = heap.length;
+
+function addHeapObject(obj) {
+    if (heap_next === heap.length) heap.push(heap.length + 1);
+    const idx = heap_next;
+    heap_next = heap[idx];
+
+    heap[idx] = obj;
+    return idx;
+}
+
+function getObject(idx) { return heap[idx]; }
+
+function dropObject(idx) {
+    if (idx < 132) return;
+    heap[idx] = heap_next;
+    heap_next = idx;
+}
+
+function takeObject(idx) {
+    const ret = getObject(idx);
+    dropObject(idx);
+    return ret;
+}
+
+function debugString(val) {
+    // primitive types
+    const type = typeof val;
+    if (type == 'number' || type == 'boolean' || val == null) {
+        return  `${val}`;
+    }
+    if (type == 'string') {
+        return `"${val}"`;
+    }
+    if (type == 'symbol') {
+        const description = val.description;
+        if (description == null) {
+            return 'Symbol';
+        } else {
+            return `Symbol(${description})`;
+        }
+    }
+    if (type == 'function') {
+        const name = val.name;
+        if (typeof name == 'string' && name.length > 0) {
+            return `Function(${name})`;
+        } else {
+            return 'Function';
+        }
+    }
+    // objects
+    if (Array.isArray(val)) {
+        const length = val.length;
+        let debug = '[';
+        if (length > 0) {
+            debug += debugString(val[0]);
+        }
+        for(let i = 1; i < length; i++) {
+            debug += ', ' + debugString(val[i]);
+        }
+        debug += ']';
+        return debug;
+    }
+    // Test for built-in
+    const builtInMatches = /\[object ([^\]]+)\]/.exec(toString.call(val));
+    let className;
+    if (builtInMatches && builtInMatches.length > 1) {
+        className = builtInMatches[1];
+    } else {
+        // Failed to match the standard '[object ClassName]'
+        return toString.call(val);
+    }
+    if (className == 'Object') {
+        // we're a user defined class or Object
+        // JSON.stringify avoids problems with cycles, and is generally much
+        // easier than looping through ownProperties of `val`.
+        try {
+            return 'Object(' + JSON.stringify(val) + ')';
+        } catch (_) {
+            return 'Object';
+        }
+    }
+    // errors
+    if (val instanceof Error) {
+        return `${val.name}: ${val.message}\n${val.stack}`;
+    }
+    // TODO we could test for more things here, like `Set`s and `Map`s.
+    return className;
+}
+
+let WASM_VECTOR_LEN = 0;
+
+let cachedUint8ArrayMemory0 = null;
+
+function getUint8ArrayMemory0() {
+    if (cachedUint8ArrayMemory0 === null || cachedUint8ArrayMemory0.byteLength === 0) {
+        cachedUint8ArrayMemory0 = new Uint8Array(wasm.memory.buffer);
+    }
+    return cachedUint8ArrayMemory0;
+}
+
+const lTextEncoder = typeof TextEncoder === 'undefined' ? (0, module.require)('util').TextEncoder : TextEncoder;
+
+let cachedTextEncoder = new lTextEncoder('utf-8');
+
+const encodeString = (typeof cachedTextEncoder.encodeInto === 'function'
+    ? function (arg, view) {
+    return cachedTextEncoder.encodeInto(arg, view);
+}
+    : function (arg, view) {
+    const buf = cachedTextEncoder.encode(arg);
+    view.set(buf);
+    return {
+        read: arg.length,
+        written: buf.length
+    };
+});
+
+function passStringToWasm0(arg, malloc, realloc) {
+
+    if (realloc === undefined) {
+        const buf = cachedTextEncoder.encode(arg);
+        const ptr = malloc(buf.length, 1) >>> 0;
+        getUint8ArrayMemory0().subarray(ptr, ptr + buf.length).set(buf);
+        WASM_VECTOR_LEN = buf.length;
+        return ptr;
+    }
+
+    let len = arg.length;
+    let ptr = malloc(len, 1) >>> 0;
+
+    const mem = getUint8ArrayMemory0();
+
+    let offset = 0;
+
+    for (; offset < len; offset++) {
+        const code = arg.charCodeAt(offset);
+        if (code > 0x7F) break;
+        mem[ptr + offset] = code;
+    }
+
+    if (offset !== len) {
+        if (offset !== 0) {
+            arg = arg.slice(offset);
+        }
+        ptr = realloc(ptr, len, len = offset + arg.length * 3, 1) >>> 0;
+        const view = getUint8ArrayMemory0().subarray(ptr + offset, ptr + len);
+        const ret = encodeString(arg, view);
+
+        offset += ret.written;
+        ptr = realloc(ptr, len, offset, 1) >>> 0;
+    }
+
+    WASM_VECTOR_LEN = offset;
+    return ptr;
+}
+
+let cachedDataViewMemory0 = null;
+
+function getDataViewMemory0() {
+    if (cachedDataViewMemory0 === null || cachedDataViewMemory0.buffer.detached === true || (cachedDataViewMemory0.buffer.detached === undefined && cachedDataViewMemory0.buffer !== wasm.memory.buffer)) {
+        cachedDataViewMemory0 = new DataView(wasm.memory.buffer);
+    }
+    return cachedDataViewMemory0;
+}
+
+const lTextDecoder = typeof TextDecoder === 'undefined' ? (0, module.require)('util').TextDecoder : TextDecoder;
+
+let cachedTextDecoder = new lTextDecoder('utf-8', { ignoreBOM: true, fatal: true });
+
+cachedTextDecoder.decode();
+
+function getStringFromWasm0(ptr, len) {
+    ptr = ptr >>> 0;
+    return cachedTextDecoder.decode(getUint8ArrayMemory0().subarray(ptr, ptr + len));
+}
+/**
+ * @param {string} template
+ * @returns {any}
+ */
+export function unescape_template(template) {
+    try {
+        const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
+        const ptr0 = passStringToWasm0(template, wasm.__wbindgen_export_0, wasm.__wbindgen_export_1);
+        const len0 = WASM_VECTOR_LEN;
+        wasm.unescape_template(retptr, ptr0, len0);
+        var r0 = getDataViewMemory0().getInt32(retptr + 4 * 0, true);
+        var r1 = getDataViewMemory0().getInt32(retptr + 4 * 1, true);
+        var r2 = getDataViewMemory0().getInt32(retptr + 4 * 2, true);
+        if (r2) {
+            throw takeObject(r1);
+        }
+        return takeObject(r0);
+    } finally {
+        wasm.__wbindgen_add_to_stack_pointer(16);
+    }
+}
+
+/**
+ * @param {string} template
+ * @returns {any}
+ */
+export function parse_template(template) {
+    try {
+        const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
+        const ptr0 = passStringToWasm0(template, wasm.__wbindgen_export_0, wasm.__wbindgen_export_1);
+        const len0 = WASM_VECTOR_LEN;
+        wasm.parse_template(retptr, ptr0, len0);
+        var r0 = getDataViewMemory0().getInt32(retptr + 4 * 0, true);
+        var r1 = getDataViewMemory0().getInt32(retptr + 4 * 1, true);
+        var r2 = getDataViewMemory0().getInt32(retptr + 4 * 2, true);
+        if (r2) {
+            throw takeObject(r1);
+        }
+        return takeObject(r0);
+    } finally {
+        wasm.__wbindgen_add_to_stack_pointer(16);
+    }
+}
+
+/**
+ * @param {string} template
+ * @returns {any}
+ */
+export function escape_template(template) {
+    try {
+        const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
+        const ptr0 = passStringToWasm0(template, wasm.__wbindgen_export_0, wasm.__wbindgen_export_1);
+        const len0 = WASM_VECTOR_LEN;
+        wasm.escape_template(retptr, ptr0, len0);
+        var r0 = getDataViewMemory0().getInt32(retptr + 4 * 0, true);
+        var r1 = getDataViewMemory0().getInt32(retptr + 4 * 1, true);
+        var r2 = getDataViewMemory0().getInt32(retptr + 4 * 2, true);
+        if (r2) {
+            throw takeObject(r1);
+        }
+        return takeObject(r0);
+    } finally {
+        wasm.__wbindgen_add_to_stack_pointer(16);
+    }
+}
+
+export function __wbg_new_405e22f390576ce2() {
+    const ret = new Object();
+    return addHeapObject(ret);
+};
+
+export function __wbg_new_78feb108b6472713() {
+    const ret = new Array();
+    return addHeapObject(ret);
+};
+
+export function __wbg_set_37837023f3d740e8(arg0, arg1, arg2) {
+    getObject(arg0)[arg1 >>> 0] = takeObject(arg2);
+};
+
+export function __wbg_set_3f1d0b984ed272ed(arg0, arg1, arg2) {
+    getObject(arg0)[takeObject(arg1)] = takeObject(arg2);
+};
+
+export function __wbindgen_debug_string(arg0, arg1) {
+    const ret = debugString(getObject(arg1));
+    const ptr1 = passStringToWasm0(ret, wasm.__wbindgen_export_0, wasm.__wbindgen_export_1);
+    const len1 = WASM_VECTOR_LEN;
+    getDataViewMemory0().setInt32(arg0 + 4 * 1, len1, true);
+    getDataViewMemory0().setInt32(arg0 + 4 * 0, ptr1, true);
+};
+
+export function __wbindgen_object_clone_ref(arg0) {
+    const ret = getObject(arg0);
+    return addHeapObject(ret);
+};
+
+export function __wbindgen_object_drop_ref(arg0) {
+    takeObject(arg0);
+};
+
+export function __wbindgen_string_new(arg0, arg1) {
+    const ret = getStringFromWasm0(arg0, arg1);
+    return addHeapObject(ret);
+};
+
+export function __wbindgen_throw(arg0, arg1) {
+    throw new Error(getStringFromWasm0(arg0, arg1));
+};
+

src-tauri/yaak-templates/pkg/yaak_templates_bg.wasm.d.ts

@@ -0,0 +1,9 @@
+/* tslint:disable */
+/* eslint-disable */
+export const memory: WebAssembly.Memory;
+export const escape_template: (a: number, b: number, c: number) => void;
+export const parse_template: (a: number, b: number, c: number) => void;
+export const unescape_template: (a: number, b: number, c: number) => void;
+export const __wbindgen_export_0: (a: number, b: number) => number;
+export const __wbindgen_export_1: (a: number, b: number, c: number, d: number) => number;
+export const __wbindgen_add_to_stack_pointer: (a: number) => number;

src-tauri/yaak-templates/src/parser.rs

@@ -578,13 +578,13 @@ mod tests {
 
     #[test]
     fn var_prefixes() -> Result<()> {
-        let mut p = Parser::new("${[ -a ]}${[ 0a ]}");
+        let mut p = Parser::new("${[ -a ]}${[ $a ]}");
         assert_eq!(
             p.parse()?.tokens,
             vec![
                 Token::Raw {
                     // Shouldn't be parsed, because they're invalid
-                    text: "${[ -a ]}${[ 0a ]}".into()
+                    text: "${[ -a ]}${[ $a ]}".into()
                 },
                 Token::Eof
             ]