Merge main into proxy branch (formatting and docs)

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

crates/yaak-crypto/index.ts

@@ -1,17 +1,17 @@
-import { invoke } from '@tauri-apps/api/core';
+import { invoke } from "@tauri-apps/api/core";
 
 export function enableEncryption(workspaceId: string) {
-  return invoke<void>('cmd_enable_encryption', { workspaceId });
+  return invoke<void>("cmd_enable_encryption", { workspaceId });
 }
 
 export function revealWorkspaceKey(workspaceId: string) {
-  return invoke<string>('cmd_reveal_workspace_key', { workspaceId });
+  return invoke<string>("cmd_reveal_workspace_key", { workspaceId });
 }
 
 export function setWorkspaceKey(args: { workspaceId: string; key: string }) {
-  return invoke<void>('cmd_set_workspace_key', args);
+  return invoke<void>("cmd_set_workspace_key", args);
 }
 
 export function disableEncryption(workspaceId: string) {
-  return invoke<void>('cmd_disable_encryption', { workspaceId });
+  return invoke<void>("cmd_disable_encryption", { workspaceId });
 }

crates/yaak-crypto/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yaakapp-internal/crypto",
-  "private": true,
   "version": "1.0.0",
+  "private": true,
   "main": "index.ts"
 }

crates/yaak-git/index.ts

@@ -31,24 +31,15 @@ export interface GitCallbacks {
   promptCredentials: (
     result: Extract<PushResult, { type: "needs_credentials" }>,
   ) => Promise<GitCredentials | null>;
-  promptDiverged: (
-    result: Extract<PullResult, { type: "diverged" }>,
-  ) => Promise<DivergedStrategy>;
+  promptDiverged: (result: Extract<PullResult, { type: "diverged" }>) => Promise<DivergedStrategy>;
   promptUncommittedChanges: () => Promise<UncommittedChangesStrategy>;
   forceSync: () => Promise<void>;
 }
 
 const onSuccess = () => queryClient.invalidateQueries({ queryKey: ["git"] });
 
-export function useGit(
-  dir: string,
-  callbacks: GitCallbacks,
-  refreshKey?: string,
-) {
-  const mutations = useMemo(
-    () => gitMutations(dir, callbacks),
-    [dir, callbacks],
-  );
+export function useGit(dir: string, callbacks: GitCallbacks, refreshKey?: string) {
+  const mutations = useMemo(() => gitMutations(dir, callbacks), [dir, callbacks]);
   const fetchAll = useQuery<void, string>({
     queryKey: ["git", "fetch_all", dir, refreshKey],
     queryFn: () => invoke("cmd_git_fetch_all", { dir }),
@@ -132,11 +123,7 @@ export const gitMutations = (dir: string, callbacks: GitCallbacks) => {
       mutationFn: (args) => invoke("cmd_git_rm_remote", { dir, ...args }),
       onSuccess,
     }),
-    createBranch: createFastMutation<
-      void,
-      string,
-      { branch: string; base?: string }
-    >({
+    createBranch: createFastMutation<void, string, { branch: string; base?: string }>({
       mutationKey: ["git", "branch", dir],
       mutationFn: (args) => invoke("cmd_git_branch", { dir, ...args }),
       onSuccess,
@@ -157,24 +144,15 @@ export const gitMutations = (dir: string, callbacks: GitCallbacks) => {
     }),
     deleteRemoteBranch: createFastMutation<void, string, { branch: string }>({
       mutationKey: ["git", "delete-remote-branch", dir],
-      mutationFn: (args) =>
-        invoke("cmd_git_delete_remote_branch", { dir, ...args }),
+      mutationFn: (args) => invoke("cmd_git_delete_remote_branch", { dir, ...args }),
       onSuccess,
     }),
-    renameBranch: createFastMutation<
-      void,
-      string,
-      { oldName: string; newName: string }
-    >({
+    renameBranch: createFastMutation<void, string, { oldName: string; newName: string }>({
       mutationKey: ["git", "rename-branch", dir],
       mutationFn: (args) => invoke("cmd_git_rename_branch", { dir, ...args }),
       onSuccess,
     }),
-    checkout: createFastMutation<
-      string,
-      string,
-      { branch: string; force: boolean }
-    >({
+    checkout: createFastMutation<string, string, { branch: string; force: boolean }>({
       mutationKey: ["git", "checkout", dir],
       mutationFn: (args) => invoke("cmd_git_checkout", { dir, ...args }),
       onSuccess,

crates/yaak-git/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yaakapp-internal/git",
-  "private": true,
   "version": "1.0.0",
+  "private": true,
   "main": "index.ts"
 }

crates/yaak-http/Cargo.toml

@@ -20,7 +20,13 @@ log = { workspace = true }
 mime_guess = "2.0.5"
 native-tls = "0.2"
 regex = "1.11.1"
-reqwest = { workspace = true, features = ["rustls-tls-manual-roots-no-provider", "native-tls", "socks", "http2", "stream"] }
+reqwest = { workspace = true, features = [
+  "rustls-tls-manual-roots-no-provider",
+  "native-tls",
+  "socks",
+  "http2",
+  "stream",
+] }
 serde = { workspace = true, features = ["derive"] }
 serde_json = { workspace = true }
 thiserror = { workspace = true }

crates/yaak-models/guest-js/atoms.ts

@@ -1,35 +1,39 @@
-import { atom } from 'jotai';
+import { atom } from "jotai";
 
-import { selectAtom } from 'jotai/utils';
-import type { AnyModel } from '../bindings/gen_models';
-import { ExtractModel } from './types';
-import { newStoreData } from './util';
+import { selectAtom } from "jotai/utils";
+import type { AnyModel } from "../bindings/gen_models";
+import { ExtractModel } from "./types";
+import { newStoreData } from "./util";
 
 export const modelStoreDataAtom = atom(newStoreData());
 
-export const cookieJarsAtom = createOrderedModelAtom('cookie_jar', 'name', 'asc');
-export const environmentsAtom = createOrderedModelAtom('environment', 'sortPriority', 'asc');
-export const foldersAtom = createModelAtom('folder');
-export const grpcConnectionsAtom = createOrderedModelAtom('grpc_connection', 'createdAt', 'desc');
-export const grpcEventsAtom = createOrderedModelAtom('grpc_event', 'createdAt', 'asc');
-export const grpcRequestsAtom = createModelAtom('grpc_request');
-export const httpRequestsAtom = createModelAtom('http_request');
-export const httpResponsesAtom = createOrderedModelAtom('http_response', 'createdAt', 'desc');
-export const httpResponseEventsAtom = createOrderedModelAtom('http_response_event', 'createdAt', 'asc');
-export const keyValuesAtom = createModelAtom('key_value');
-export const pluginsAtom = createModelAtom('plugin');
-export const settingsAtom = createSingularModelAtom('settings');
-export const websocketRequestsAtom = createModelAtom('websocket_request');
-export const websocketEventsAtom = createOrderedModelAtom('websocket_event', 'createdAt', 'asc');
-export const websocketConnectionsAtom = createOrderedModelAtom(
-  'websocket_connection',
-  'createdAt',
-  'desc',
+export const cookieJarsAtom = createOrderedModelAtom("cookie_jar", "name", "asc");
+export const environmentsAtom = createOrderedModelAtom("environment", "sortPriority", "asc");
+export const foldersAtom = createModelAtom("folder");
+export const grpcConnectionsAtom = createOrderedModelAtom("grpc_connection", "createdAt", "desc");
+export const grpcEventsAtom = createOrderedModelAtom("grpc_event", "createdAt", "asc");
+export const grpcRequestsAtom = createModelAtom("grpc_request");
+export const httpRequestsAtom = createModelAtom("http_request");
+export const httpResponsesAtom = createOrderedModelAtom("http_response", "createdAt", "desc");
+export const httpResponseEventsAtom = createOrderedModelAtom(
+  "http_response_event",
+  "createdAt",
+  "asc",
 );
-export const workspaceMetasAtom = createModelAtom('workspace_meta');
-export const workspacesAtom = createOrderedModelAtom('workspace', 'name', 'asc');
+export const keyValuesAtom = createModelAtom("key_value");
+export const pluginsAtom = createModelAtom("plugin");
+export const settingsAtom = createSingularModelAtom("settings");
+export const websocketRequestsAtom = createModelAtom("websocket_request");
+export const websocketEventsAtom = createOrderedModelAtom("websocket_event", "createdAt", "asc");
+export const websocketConnectionsAtom = createOrderedModelAtom(
+  "websocket_connection",
+  "createdAt",
+  "desc",
+);
+export const workspaceMetasAtom = createModelAtom("workspace_meta");
+export const workspacesAtom = createOrderedModelAtom("workspace", "name", "asc");
 
-export function createModelAtom<M extends AnyModel['model']>(modelType: M) {
+export function createModelAtom<M extends AnyModel["model"]>(modelType: M) {
   return selectAtom(
     modelStoreDataAtom,
     (data) => Object.values(data[modelType] ?? {}),
@@ -37,19 +41,19 @@ export function createModelAtom<M extends AnyModel['model']>(modelType: M) {
   );
 }
 
-export function createSingularModelAtom<M extends AnyModel['model']>(modelType: M) {
+export function createSingularModelAtom<M extends AnyModel["model"]>(modelType: M) {
   return selectAtom(modelStoreDataAtom, (data) => {
     const modelData = Object.values(data[modelType] ?? {});
     const item = modelData[0];
-    if (item == null) throw new Error('Failed creating singular model with no data: ' + modelType);
+    if (item == null) throw new Error("Failed creating singular model with no data: " + modelType);
     return item;
   });
 }
 
-export function createOrderedModelAtom<M extends AnyModel['model']>(
+export function createOrderedModelAtom<M extends AnyModel["model"]>(
   modelType: M,
   field: keyof ExtractModel<AnyModel, M>,
-  order: 'asc' | 'desc',
+  order: "asc" | "desc",
 ) {
   return selectAtom(
     modelStoreDataAtom,
@@ -58,7 +62,7 @@ export function createOrderedModelAtom<M extends AnyModel['model']>(
       return Object.values(modelData).sort(
         (a: ExtractModel<AnyModel, M>, b: ExtractModel<AnyModel, M>) => {
           const n = a[field] > b[field] ? 1 : -1;
-          return order === 'desc' ? n * -1 : n;
+          return order === "desc" ? n * -1 : n;
         },
       );
     },

crates/yaak-models/guest-js/index.ts

@@ -1,11 +1,11 @@
-import { AnyModel } from '../bindings/gen_models';
+import { AnyModel } from "../bindings/gen_models";
 
-export * from '../bindings/gen_models';
-export * from '../bindings/gen_util';
-export * from './store';
-export * from './atoms';
+export * from "../bindings/gen_models";
+export * from "../bindings/gen_util";
+export * from "./store";
+export * from "./atoms";
 
 export function modelTypeLabel(m: AnyModel): string {
   const capitalize = (str: string) => str.charAt(0).toUpperCase() + str.slice(1);
-  return m.model.split('_').map(capitalize).join(' ');
+  return m.model.split("_").map(capitalize).join(" ");
 }

crates/yaak-models/guest-js/store.ts

@@ -62,25 +62,20 @@ export async function changeModelStoreWorkspace(workspaceId: string | null) {
   _activeWorkspaceId = workspaceId;
 }
 
-export function listModels<
-  M extends AnyModel["model"],
-  T extends ExtractModel<AnyModel, M>,
->(modelType: M | ReadonlyArray<M>): T[] {
+export function listModels<M extends AnyModel["model"], T extends ExtractModel<AnyModel, M>>(
+  modelType: M | ReadonlyArray<M>,
+): T[] {
   let data = mustStore().get(modelStoreDataAtom);
-  const types: ReadonlyArray<M> = Array.isArray(modelType)
-    ? modelType
-    : [modelType];
+  const types: ReadonlyArray<M> = Array.isArray(modelType) ? modelType : [modelType];
   return types.flatMap((t) => Object.values(data[t]) as T[]);
 }
 
-export function getModel<
-  M extends AnyModel["model"],
-  T extends ExtractModel<AnyModel, M>,
->(modelType: M | ReadonlyArray<M>, id: string): T | null {
+export function getModel<M extends AnyModel["model"], T extends ExtractModel<AnyModel, M>>(
+  modelType: M | ReadonlyArray<M>,
+  id: string,
+): T | null {
   let data = mustStore().get(modelStoreDataAtom);
-  const types: ReadonlyArray<M> = Array.isArray(modelType)
-    ? modelType
-    : [modelType];
+  const types: ReadonlyArray<M> = Array.isArray(modelType) ? modelType : [modelType];
   for (const t of types) {
     let v = data[t][id];
     if (v?.model === t) return v as T;
@@ -97,31 +92,30 @@ export function getAnyModel(id: string): AnyModel | null {
   return null;
 }
 
-export function patchModelById<
-  M extends AnyModel["model"],
-  T extends ExtractModel<AnyModel, M>,
->(model: M, id: string, patch: Partial<T> | ((prev: T) => T)): Promise<string> {
+export function patchModelById<M extends AnyModel["model"], T extends ExtractModel<AnyModel, M>>(
+  model: M,
+  id: string,
+  patch: Partial<T> | ((prev: T) => T),
+): Promise<string> {
   let prev = getModel<M, T>(model, id);
   if (prev == null) {
     throw new Error(`Failed to get model to patch id=${id} model=${model}`);
   }
 
-  const newModel =
-    typeof patch === "function" ? patch(prev) : { ...prev, ...patch };
+  const newModel = typeof patch === "function" ? patch(prev) : { ...prev, ...patch };
   return updateModel(newModel);
 }
 
-export async function patchModel<
-  M extends AnyModel["model"],
-  T extends ExtractModel<AnyModel, M>,
->(base: Pick<T, "id" | "model">, patch: Partial<T>): Promise<string> {
+export async function patchModel<M extends AnyModel["model"], T extends ExtractModel<AnyModel, M>>(
+  base: Pick<T, "id" | "model">,
+  patch: Partial<T>,
+): Promise<string> {
   return patchModelById<M, T>(base.model, base.id, patch);
 }
 
-export async function updateModel<
-  M extends AnyModel["model"],
-  T extends ExtractModel<AnyModel, M>,
->(model: T): Promise<string> {
+export async function updateModel<M extends AnyModel["model"], T extends ExtractModel<AnyModel, M>>(
+  model: T,
+): Promise<string> {
   return invoke<string>("models_upsert", { model });
 }
 
@@ -133,20 +127,18 @@ export async function deleteModelById<
   await deleteModel(model);
 }
 
-export async function deleteModel<
-  M extends AnyModel["model"],
-  T extends ExtractModel<AnyModel, M>,
->(model: T | null) {
+export async function deleteModel<M extends AnyModel["model"], T extends ExtractModel<AnyModel, M>>(
+  model: T | null,
+) {
   if (model == null) {
     throw new Error("Failed to delete null model");
   }
   await invoke<string>("models_delete", { model });
 }
 
-export function duplicateModel<
-  M extends AnyModel["model"],
-  T extends ExtractModel<AnyModel, M>,
->(model: T | null) {
+export function duplicateModel<M extends AnyModel["model"], T extends ExtractModel<AnyModel, M>>(
+  model: T | null,
+) {
   if (model == null) {
     throw new Error("Failed to duplicate null model");
   }
@@ -157,11 +149,7 @@ export function duplicateModel<
     const existingModels = listModels(model.model);
     for (let i = 0; i < 100; i++) {
       const hasConflict = existingModels.some((m) => {
-        if (
-          "folderId" in m &&
-          "folderId" in model &&
-          model.folderId !== m.folderId
-        ) {
+        if ("folderId" in m && "folderId" in model && model.folderId !== m.folderId) {
           return false;
         } else if (resolvedModelName(m) !== name) {
           return false;
@@ -187,15 +175,15 @@ export function duplicateModel<
   return invoke<string>("models_duplicate", { model: { ...model, name } });
 }
 
-export async function createGlobalModel<
-  T extends Exclude<AnyModel, { workspaceId: string }>,
->(patch: Partial<T> & Pick<T, "model">): Promise<string> {
+export async function createGlobalModel<T extends Exclude<AnyModel, { workspaceId: string }>>(
+  patch: Partial<T> & Pick<T, "model">,
+): Promise<string> {
   return invoke<string>("models_upsert", { model: patch });
 }
 
-export async function createWorkspaceModel<
-  T extends Extract<AnyModel, { workspaceId: string }>,
->(patch: Partial<T> & Pick<T, "model" | "workspaceId">): Promise<string> {
+export async function createWorkspaceModel<T extends Extract<AnyModel, { workspaceId: string }>>(
+  patch: Partial<T> & Pick<T, "model" | "workspaceId">,
+): Promise<string> {
   return invoke<string>("models_upsert", { model: patch });
 }
 

crates/yaak-models/guest-js/types.ts

@@ -1,8 +1,8 @@
-import { createStore } from 'jotai';
-import { AnyModel } from '../bindings/gen_models';
+import { createStore } from "jotai";
+import { AnyModel } from "../bindings/gen_models";
 
 export type ExtractModel<T, M> = T extends { model: M } ? T : never;
 export type ModelStoreData<T extends AnyModel = AnyModel> = {
-  [M in T['model']]: Record<string, Extract<T, { model: M }>>;
+  [M in T["model"]]: Record<string, Extract<T, { model: M }>>;
 };
 export type JotaiStore = ReturnType<typeof createStore>;

crates/yaak-models/guest-js/util.ts

@@ -1,4 +1,4 @@
-import { ModelStoreData } from './types';
+import { ModelStoreData } from "./types";
 
 export function newStoreData(): ModelStoreData {
   return {

crates/yaak-models/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yaakapp-internal/models",
-  "private": true,
   "version": "1.0.0",
+  "private": true,
   "main": "guest-js/index.ts"
 }

crates/yaak-plugins/index.ts

@@ -1,30 +1,30 @@
-import { invoke } from '@tauri-apps/api/core';
-import { PluginNameVersion, PluginSearchResponse, PluginUpdatesResponse } from './bindings/gen_api';
+import { invoke } from "@tauri-apps/api/core";
+import { PluginNameVersion, PluginSearchResponse, PluginUpdatesResponse } from "./bindings/gen_api";
 
-export * from './bindings/gen_models';
-export * from './bindings/gen_events';
-export * from './bindings/gen_search';
+export * from "./bindings/gen_models";
+export * from "./bindings/gen_events";
+export * from "./bindings/gen_search";
 
 export async function searchPlugins(query: string) {
-  return invoke<PluginSearchResponse>('cmd_plugins_search', { query });
+  return invoke<PluginSearchResponse>("cmd_plugins_search", { query });
 }
 
 export async function installPlugin(name: string, version: string | null) {
-  return invoke<void>('cmd_plugins_install', { name, version });
+  return invoke<void>("cmd_plugins_install", { name, version });
 }
 
 export async function uninstallPlugin(pluginId: string) {
-  return invoke<void>('cmd_plugins_uninstall', { pluginId });
+  return invoke<void>("cmd_plugins_uninstall", { pluginId });
 }
 
 export async function checkPluginUpdates() {
-  return invoke<PluginUpdatesResponse>('cmd_plugins_updates', {});
+  return invoke<PluginUpdatesResponse>("cmd_plugins_updates", {});
 }
 
 export async function updateAllPlugins() {
-  return invoke<PluginNameVersion[]>('cmd_plugins_update_all', {});
+  return invoke<PluginNameVersion[]>("cmd_plugins_update_all", {});
 }
 
 export async function installPluginFromDirectory(directory: string) {
-  return invoke<void>('cmd_plugins_install_from_directory', { directory });
+  return invoke<void>("cmd_plugins_install_from_directory", { directory });
 }

crates/yaak-plugins/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yaakapp-internal/plugins",
-  "private": true,
   "version": "1.0.0",
+  "private": true,
   "main": "index.ts"
 }

crates/yaak-plugins/src/manager.rs

@@ -187,7 +187,11 @@ impl PluginManager {
         let init_errors = plugin_manager.initialize_all_plugins(plugins, plugin_context).await;
         if !init_errors.is_empty() {
             for (dir, err) in &init_errors {
+<<<<<<< HEAD
                 error!("Failed to initialize plugin {dir}: {err}");
+=======
+                warn!("Plugin failed to initialize: {dir}: {err}");
+>>>>>>> main
             }
             *plugin_manager.init_errors.lock().await = init_errors;
         }
@@ -195,8 +199,13 @@ impl PluginManager {
         Ok(plugin_manager)
     }
 
+<<<<<<< HEAD
     /// Take and clear any plugin initialization errors.
     /// Returns the errors only once — subsequent calls return an empty list.
+=======
+    /// Take any initialization errors, clearing them from the manager.
+    /// Returns a list of `(plugin_directory, error_message)` pairs.
+>>>>>>> main
     pub async fn take_init_errors(&self) -> Vec<(String, String)> {
         std::mem::take(&mut *self.init_errors.lock().await)
     }

crates/yaak-proxy/Cargo.toml

@@ -10,7 +10,14 @@ hyper-util = { version = "0.1", features = ["tokio", "server-auto", "client-lega
 http-body-util = "0.1"
 http = "1"
 bytes = "1"
-tokio = { workspace = true, features = ["rt-multi-thread", "net", "sync", "macros", "time", "io-util"] }
+tokio = { workspace = true, features = [
+  "rt-multi-thread",
+  "net",
+  "sync",
+  "macros",
+  "time",
+  "io-util",
+] }
 rcgen = "0.13"
 rustls = { workspace = true, features = ["ring"] }
 rustls-native-certs = "0.8"

crates/yaak-sse/index.ts

@@ -1 +1 @@
-export * from './bindings/sse';
+export * from "./bindings/sse";

crates/yaak-sse/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yaakapp-internal/sse",
-  "private": true,
   "version": "1.0.0",
+  "private": true,
   "main": "index.ts"
 }

crates/yaak-sync/index.ts

@@ -17,11 +17,7 @@ export async function calculateSyncFsOnly(dir: string) {
   return invoke<SyncOp[]>("cmd_sync_calculate_fs", { dir });
 }
 
-export async function applySync(
-  workspaceId: string,
-  syncDir: string,
-  syncOps: SyncOp[],
-) {
+export async function applySync(workspaceId: string, syncDir: string, syncOps: SyncOp[]) {
   return invoke<void>("cmd_sync_apply", {
     workspaceId,
     syncDir,
@@ -63,12 +59,7 @@ function unlistenToWatcher(unlistenEvent: string) {
 }
 
 function getWatchKeys() {
-  return (
-    sessionStorage
-      .getItem("workspace-file-watchers")
-      ?.split(",")
-      .filter(Boolean) ?? []
-  );
+  return sessionStorage.getItem("workspace-file-watchers")?.split(",").filter(Boolean) ?? [];
 }
 
 function setWatchKeys(keys: string[]) {

crates/yaak-sync/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yaakapp-internal/sync",
-  "private": true,
   "version": "1.0.0",
+  "private": true,
   "main": "index.ts"
 }

crates/yaak-templates/build-wasm.cjs

@@ -1,8 +1,27 @@
-const { execSync } = require('node:child_process');
+const { execSync } = require("node:child_process");
+const fs = require("node:fs");
+const path = require("node:path");
 
-if (process.env.SKIP_WASM_BUILD === '1') {
-  console.log('Skipping wasm-pack build (SKIP_WASM_BUILD=1)');
+if (process.env.SKIP_WASM_BUILD === "1") {
+  console.log("Skipping wasm-pack build (SKIP_WASM_BUILD=1)");
   return;
 }
 
-execSync('wasm-pack build --target bundler', { stdio: 'inherit' });
+execSync("wasm-pack build --target bundler", { stdio: "inherit" });
+
+// Rewrite the generated entry to use Vite's ?init import style instead of
+// the ES Module Integration style that wasm-pack generates, which Vite/rolldown
+// does not support in production builds.
+const entry = path.join(__dirname, "pkg", "yaak_templates.js");
+fs.writeFileSync(
+  entry,
+  [
+    'import init from "./yaak_templates_bg.wasm?init";',
+    'export * from "./yaak_templates_bg.js";',
+    'import * as bg from "./yaak_templates_bg.js";',
+    'const instance = await init({ "./yaak_templates_bg.js": bg });',
+    "bg.__wbg_set_wasm(instance.exports);",
+    "instance.exports.__wbindgen_start();",
+    "",
+  ].join("\n"),
+);

crates/yaak-templates/index.ts

@@ -1,6 +1,6 @@
-export * from './bindings/parser';
-import { Tokens } from './bindings/parser';
-import { escape_template, parse_template, unescape_template } from './pkg';
+export * from "./bindings/parser";
+import { Tokens } from "./bindings/parser";
+import { escape_template, parse_template, unescape_template } from "./pkg";
 
 export function parseTemplate(template: string) {
   return parse_template(template) as Tokens;

crates/yaak-templates/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@yaakapp-internal/templates",
-  "private": true,
   "version": "1.0.0",
+  "private": true,
   "main": "index.ts",
   "scripts": {
     "bootstrap": "npm run build",

crates/yaak-templates/pkg/yaak_templates.js

@@ -1,5 +1,6 @@
-import * as wasm from "./yaak_templates_bg.wasm";
+import init from "./yaak_templates_bg.wasm?init";
 export * from "./yaak_templates_bg.js";
-import { __wbg_set_wasm } from "./yaak_templates_bg.js";
-__wbg_set_wasm(wasm);
-wasm.__wbindgen_start();
+import * as bg from "./yaak_templates_bg.js";
+const instance = await init({ "./yaak_templates_bg.js": bg });
+bg.__wbg_set_wasm(instance.exports);
+instance.exports.__wbindgen_start();

crates/yaak-ws/Cargo.toml

@@ -14,7 +14,10 @@ url = "2"
 serde_json = { workspace = true }
 thiserror = { workspace = true }
 tokio = { workspace = true, features = ["macros", "time", "test-util", "rt"] }
-tokio-tungstenite = { version = "0.26.2", default-features = false, features = ["rustls-tls-native-roots", "connect"] }
+tokio-tungstenite = { version = "0.26.2", default-features = false, features = [
+  "rustls-tls-native-roots",
+  "connect",
+] }
 yaak-http = { workspace = true }
 yaak-tls = { workspace = true }
 yaak-models = { workspace = true }

crates/yaak-ws/index.ts

@@ -1,8 +1,8 @@
-import { invoke } from '@tauri-apps/api/core';
-import { WebsocketConnection } from '@yaakapp-internal/models';
+import { invoke } from "@tauri-apps/api/core";
+import { WebsocketConnection } from "@yaakapp-internal/models";
 
 export function deleteWebsocketConnections(requestId: string) {
-  return invoke('cmd_ws_delete_connections', {
+  return invoke("cmd_ws_delete_connections", {
     requestId,
   });
 }
@@ -16,7 +16,7 @@ export function connectWebsocket({
   environmentId: string | null;
   cookieJarId: string | null;
 }) {
-  return invoke('cmd_ws_connect', {
+  return invoke("cmd_ws_connect", {
     requestId,
     environmentId,
     cookieJarId,
@@ -24,7 +24,7 @@ export function connectWebsocket({
 }
 
 export function closeWebsocket({ connectionId }: { connectionId: string }) {
-  return invoke('cmd_ws_close', {
+  return invoke("cmd_ws_close", {
     connectionId,
   });
 }
@@ -36,7 +36,7 @@ export function sendWebsocket({
   connectionId: string;
   environmentId: string | null;
 }) {
-  return invoke('cmd_ws_send', {
+  return invoke("cmd_ws_send", {
     connectionId,
     environmentId,
   });

crates/yaak-ws/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yaakapp-internal/ws",
-  "private": true,
   "version": "1.0.0",
+  "private": true,
   "main": "index.ts"
 }