Fix Vite build dir

Fixes #97

.eslintignore

@@ -1,5 +1,6 @@
 node_modules/
 dist/
-.prettierrc.cjs
 .eslintrc.cjs
-env.d.ts
+.prettierrc.cjs
+src-web/postcss.config.cjs
+src-web/vite.config.ts

.eslintrc.cjs

@@ -17,9 +17,8 @@ module.exports = {
     'plugin-runtime/**/*',
     'plugin-runtime-types/**/*',
     'src-tauri/**/*',
-    'plugins/**/*',
-    'tailwind.config.cjs',
-    'vite.config.ts',
+    'src-web/tailwind.config.cjs',
+    'src-web/vite.config.ts',
   ],
   settings: {
     react: {

.github/workflows/release.yml

@@ -16,10 +16,10 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - platform: 'macos-latest' # for Arm-based macs (M1 and above).
+          - platform: 'macos-latest' # for Arm-based Macs (M1 and above).
             args: '--target aarch64-apple-darwin'
             yaak_arch: 'arm64'
-          - platform: 'macos-latest' # for Intel-based macs.
+          - platform: 'macos-latest' # for Intel-based Macs.
             args: '--target x86_64-apple-darwin'
             yaak_arch: 'x64'
           - platform: 'ubuntu-22.04' # for Tauri v1, you could replace this with ubuntu-20.04.
@@ -36,7 +36,7 @@ jobs:
       - name: Setup Node
         uses: actions/setup-node@v4
         with:
-          node-version: 20
+          node-version: 22
 
       - uses: actions/setup-go@v5
         with:
@@ -66,12 +66,7 @@ jobs:
           sudo apt-get update
           sudo apt-get install -y libwebkit2gtk-4.1-dev libappindicator3-dev librsvg2-dev patchelf
 
-      - name: Install Node dependencies
-        run: |
-          npm ci
-
-      - name: Install plugin-runtime Node dependencies
-        working-directory: plugin-runtime
+      - name: Install NPM Dependencies
         run: |
           npm ci
 
@@ -80,11 +75,6 @@ jobs:
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Install yaak CLI
-        run: |
-          npm install -g @yaakapp/cli
-          yaakcli --version
-
       - name: Run lint
         run: npm run lint
 

.husky/.gitignore

@@ -1 +0,0 @@
-_

.husky/pre-commit

@@ -1,4 +0,0 @@
-#!/bin/sh
-. "$(dirname "$0")/_/husky.sh"
-
-npx lint-staged

.sqllsrc.json

@@ -1,5 +0,0 @@
-{
-  "name": "yaak-dev",
-  "adapter": "sqlite3",
-  "filename": "src-tauri/db.sqlite"
-}

DEVELOPMENT.md

@@ -10,3 +10,10 @@ Then, you can run the app.
 1. Checkout the [plugins](https://github.com/yaakapp/plugins) repository
 2. Run `YAAK_PLUGINS_DIR="..." npm run build` to generate an icon, fetch external binaries, and build local JS dependencies
 3. Run the desktop app in dev mode `npm start`
+
+## SQLite Migrations
+
+1. From `src-tauri/`, run `sqlx migrate add migration-name`
+2. Migrate the DB by running the app (may need to `cargo clean` first)
+
+_Note: Yaak development builds use a separate database location than production releases_

package.json

@@ -2,120 +2,44 @@
   "name": "yaak-app",
   "private": true,
   "version": "0.0.0",
-  "type": "module",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/yaakapp/app.git"
   },
+  "workspaces": [
+    "src-tauri/yaak_plugin_runtime",
+    "src-tauri/yaak_models",
+    "src-tauri/yaak_templates",
+    "src-web",
+    "plugin-runtime",
+    "plugin-runtime-types"
+  ],
   "scripts": {
-    "start": "npm run tauri-dev:desktop",
-    "tauri-dev:desktop": "tauri dev --no-watch --config ./src-tauri/tauri-dev.conf.json",
-    "tauri-dev:ios": "tauri ios dev --force-ip-prompt --config ./src-tauri/tauri-dev.conf.json",
-    "tauri-build": "tauri build",
+    "app-build": "tauri build",
+    "app-dev": "tauri dev --no-watch --config ./src-tauri/tauri-dev.conf.json",
+    "tauri-before-build": "npm run vendor && npm run --workspaces --if-present build",
+    "tauri-before-dev": "npm run --workspaces --if-present dev",
     "tauri": "tauri",
-    "dev:js": "vite dev",
-    "lint": "tsc && eslint . --ext .ts,.tsx",
-    "build": "run-p build:*",
-    "build:icon:release": "tauri icon design/icon.png --output ./src-tauri/icons/release",
-    "build:icon:dev": "tauri icon design/icon-dev.png --output ./src-tauri/icons/dev",
-    "build:js": "vite build",
-    "build:plugin-runtime": "npm run --prefix plugin-runtime build",
-    "build:vendor-protoc": "node scripts/vendor-protoc.cjs",
-    "build:vendor-plugins": "node scripts/vendor-plugins.cjs",
-    "build:vendor-node": "node scripts/vendor-node.cjs",
-    "prepare": "husky install",
+    "lint": "npm run --workspaces --if-present lint",
+    "vendor": "run-p vendor:*",
+    "vendor:vendor-protoc": "node scripts/vendor-protoc.cjs",
+    "vendor:vendor-plugins": "node scripts/vendor-plugins.cjs",
+    "vendor:vendor-node": "node scripts/vendor-node.cjs",
     "replace-version": "node scripts/replace-version.cjs"
   },
-  "dependencies": {
-    "@codemirror/commands": "^6",
-    "@codemirror/lang-javascript": "^6",
-    "@codemirror/lang-json": "^6",
-    "@codemirror/lang-xml": "^6",
-    "@codemirror/language": "^6",
-    "@codemirror/search": "^6",
-    "@lezer/generator": "^1.7.1",
-    "@lezer/highlight": "^1.2.1",
-    "@lezer/lr": "^1.4.2",
-    "@react-hook/resize-observer": "^2.0.2",
-    "@tailwindcss/container-queries": "^0.1.1",
-    "@tanstack/react-query": "^5.55.4",
-    "@tauri-apps/api": "^2.0.0-rc.4",
-    "@tauri-apps/plugin-clipboard-manager": "^2.0.0-rc.2",
-    "@tauri-apps/plugin-dialog": "^2.0.0-rc.1",
-    "@tauri-apps/plugin-fs": "^2.0.0-rc.2",
-    "@tauri-apps/plugin-log": "^2.0.0-rc.1",
-    "@tauri-apps/plugin-os": "^2.0.0-rc.1",
-    "@tauri-apps/plugin-shell": "^2.0.0-rc.1",
-    "@yaakapp/api": "^0.1.17",
-    "buffer": "^6.0.3",
-    "classnames": "^2.5.1",
-    "cm6-graphql": "^0.0.9",
-    "codemirror": "^6.0.1",
-    "codemirror-json-schema": "^0.7.8",
-    "date-fns": "^3.6.0",
-    "eventemitter3": "^5.0.1",
-    "fast-fuzzy": "^1.12.0",
-    "focus-trap-react": "^10.2.3",
-    "format-graphql": "^1.5.0",
-    "framer-motion": "^11.5.4",
-    "jotai": "^2.9.3",
-    "lucide-react": "^0.439.0",
-    "mime": "^4.0.4",
-    "papaparse": "^5.4.1",
-    "parse-color": "^1.0.0",
-    "react": "^18.3.1",
-    "react-dnd": "^16.0.1",
-    "react-dnd-html5-backend": "^16.0.1",
-    "react-dom": "^18.3.1",
-    "react-helmet-async": "^2.0.5",
-    "react-pdf": "^9.1.0",
-    "react-router-dom": "^6.26.2",
-    "react-use": "^17.5.1",
-    "slugify": "^1.6.6",
-    "uuid": "^10.0.0",
-    "xml-formatter": "^3.6.3"
-  },
   "devDependencies": {
-    "@tailwindcss/nesting": "^0.0.0-insiders.565cd3e",
-    "@tanstack/react-query-devtools": "^5.55.4",
-    "@tauri-apps/cli": "^2.0.0-rc.14",
-    "@types/node": "^22.5.4",
-    "@types/papaparse": "^5.3.14",
-    "@types/parse-color": "^1.0.3",
-    "@types/parse-json": "^4.0.2",
-    "@types/react": "^18.3.5",
-    "@types/react-dom": "^18.3.0",
-    "@types/uuid": "^10.0.0",
+    "@tauri-apps/cli": "^2.0.0-rc.16",
     "@typescript-eslint/eslint-plugin": "^8.5.0",
     "@typescript-eslint/parser": "^8.5.0",
-    "@vitejs/plugin-react": "^4.3.1",
-    "autoprefixer": "^10.4.20",
-    "decompress": "^4.2.1",
     "eslint": "^8",
     "eslint-config-prettier": "^8",
     "eslint-plugin-import": "^2.30.0",
     "eslint-plugin-jsx-a11y": "^6.10.0",
     "eslint-plugin-react": "^7.35.2",
     "eslint-plugin-react-hooks": "^4.6.2",
-    "husky": "^9.1.5",
-    "internal-ip": "^8.0.0",
-    "lint-staged": "^15.2.10",
     "nodejs-file-downloader": "^4.13.0",
     "npm-run-all": "^4.1.5",
-    "postcss": "^8.4.45",
-    "postcss-nesting": "^13.0.0",
     "prettier": "^3.3.3",
-    "react-devtools": "^5.3.1",
-    "rimraf": "^6.0.1",
-    "tailwindcss": "^3.4.10",
-    "typescript": "^5.6.0",
-    "vite": "^5.4.4",
-    "vite-plugin-static-copy": "^1.0.6",
-    "vite-plugin-svgr": "^4.2.0",
-    "vite-plugin-top-level-await": "^1.4.4"
-  },
-  "lint-staged": {
-    "*.{ts,tsx}": "eslint --cache --fix",
-    "*.{js,css,md}": "prettier --write"
+    "typescript": "^5.6.0"
   }
 }

plugin-runtime-types/package.json

@@ -1,19 +1,23 @@
 {
   "name": "@yaakapp/api",
-  "version": "0.1.17",
+  "version": "0.2.7",
   "main": "lib/index.js",
   "typings": "./lib/index.d.ts",
   "files": [
-    "lib"
+    "lib/**/*"
   ],
   "scripts": {
-    "build": "tsc",
+    "build": "run-s build:copy-types build:tsc",
+    "build:tsc": "tsc",
+    "build:copy-types": "cpy --flat ../src-tauri/yaak_plugin_runtime/bindings/*.ts ./src/bindings/",
     "prepublishOnly": "npm run build"
   },
   "dependencies": {
     "@types/node": "^22.5.4"
   },
   "devDependencies": {
+    "cpy-cli": "^5.0.0",
+    "npm-run-all": "^4.1.5",
     "typescript": "^5.6.2"
   }
 }

plugin-runtime-types/src/bindings/events.ts

@@ -0,0 +1,89 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { Environment } from "./models";
+import type { Folder } from "./models";
+import type { GrpcRequest } from "./models";
+import type { HttpRequest } from "./models";
+import type { HttpResponse } from "./models";
+import type { Workspace } from "./models";
+
+export type BootRequest = { dir: string, };
+
+export type BootResponse = { name: string, version: string, capabilities: Array<string>, };
+
+export type CallHttpRequestActionArgs = { httpRequest: HttpRequest, };
+
+export type CallHttpRequestActionRequest = { key: string, pluginRefId: string, args: CallHttpRequestActionArgs, };
+
+export type CallTemplateFunctionArgs = { purpose: RenderPurpose, values: { [key in string]?: string }, };
+
+export type CallTemplateFunctionRequest = { name: string, args: CallTemplateFunctionArgs, };
+
+export type CallTemplateFunctionResponse = { value: string | null, };
+
+export type Color = "custom" | "default" | "primary" | "secondary" | "info" | "success" | "notice" | "warning" | "danger";
+
+export type CopyTextRequest = { text: string, };
+
+export type ExportHttpRequestRequest = { httpRequest: HttpRequest, };
+
+export type ExportHttpRequestResponse = { content: string, };
+
+export type FilterRequest = { content: string, filter: string, };
+
+export type FilterResponse = { content: string, };
+
+export type FindHttpResponsesRequest = { requestId: string, limit: number | null, };
+
+export type FindHttpResponsesResponse = { httpResponses: Array<HttpResponse>, };
+
+export type GetHttpRequestActionsRequest = Record<string, never>;
+
+export type GetHttpRequestActionsResponse = { actions: Array<HttpRequestAction>, pluginRefId: string, };
+
+export type GetHttpRequestByIdRequest = { id: string, };
+
+export type GetHttpRequestByIdResponse = { httpRequest: HttpRequest | null, };
+
+export type GetTemplateFunctionsResponse = { functions: Array<TemplateFunction>, pluginRefId: string, };
+
+export type HttpRequestAction = { key: string, label: string, icon: string | null, };
+
+export type Icon = "copy" | "info" | "check_circle" | "alert_triangle";
+
+export type ImportRequest = { content: string, };
+
+export type ImportResources = { workspaces: Array<Workspace>, environments: Array<Environment>, folders: Array<Folder>, httpRequests: Array<HttpRequest>, grpcRequests: Array<GrpcRequest>, };
+
+export type ImportResponse = { resources: ImportResources, };
+
+export type InternalEvent = { id: string, pluginRefId: string, replyId: string | null, payload: InternalEventPayload, };
+
+export type InternalEventPayload = { "type": "boot_request" } & BootRequest | { "type": "boot_response" } & BootResponse | { "type": "reload_request" } | { "type": "reload_response" } | { "type": "terminate_request" } | { "type": "terminate_response" } | { "type": "import_request" } & ImportRequest | { "type": "import_response" } & ImportResponse | { "type": "filter_request" } & FilterRequest | { "type": "filter_response" } & FilterResponse | { "type": "export_http_request_request" } & ExportHttpRequestRequest | { "type": "export_http_request_response" } & ExportHttpRequestResponse | { "type": "send_http_request_request" } & SendHttpRequestRequest | { "type": "send_http_request_response" } & SendHttpRequestResponse | { "type": "get_http_request_actions_request" } & GetHttpRequestActionsRequest | { "type": "get_http_request_actions_response" } & GetHttpRequestActionsResponse | { "type": "call_http_request_action_request" } & CallHttpRequestActionRequest | { "type": "get_template_functions_request" } | { "type": "get_template_functions_response" } & GetTemplateFunctionsResponse | { "type": "call_template_function_request" } & CallTemplateFunctionRequest | { "type": "call_template_function_response" } & CallTemplateFunctionResponse | { "type": "copy_text_request" } & CopyTextRequest | { "type": "render_http_request_request" } & RenderHttpRequestRequest | { "type": "render_http_request_response" } & RenderHttpRequestResponse | { "type": "show_toast_request" } & ShowToastRequest | { "type": "get_http_request_by_id_request" } & GetHttpRequestByIdRequest | { "type": "get_http_request_by_id_response" } & GetHttpRequestByIdResponse | { "type": "find_http_responses_request" } & FindHttpResponsesRequest | { "type": "find_http_responses_response" } & FindHttpResponsesResponse | { "type": "empty_response" };
+
+export type RenderHttpRequestRequest = { httpRequest: HttpRequest, purpose: RenderPurpose, };
+
+export type RenderHttpRequestResponse = { httpRequest: HttpRequest, };
+
+export type RenderPurpose = "send" | "preview";
+
+export type SendHttpRequestRequest = { httpRequest: HttpRequest, };
+
+export type SendHttpRequestResponse = { httpResponse: HttpResponse, };
+
+export type ShowToastRequest = { message: string, color?: Color | null, icon?: Icon | null, };
+
+export type TemplateFunction = { name: string, args: Array<TemplateFunctionArg>, };
+
+export type TemplateFunctionArg = { "type": "text" } & TemplateFunctionTextArg | { "type": "select" } & TemplateFunctionSelectArg | { "type": "checkbox" } & TemplateFunctionCheckboxArg | { "type": "http_request" } & TemplateFunctionHttpRequestArg;
+
+export type TemplateFunctionBaseArg = { name: string, optional?: boolean | null, label?: string | null, defaultValue?: string | null, };
+
+export type TemplateFunctionCheckboxArg = { name: string, optional?: boolean | null, label?: string | null, defaultValue?: string | null, };
+
+export type TemplateFunctionHttpRequestArg = { name: string, optional?: boolean | null, label?: string | null, defaultValue?: string | null, };
+
+export type TemplateFunctionSelectArg = { options: Array<TemplateFunctionSelectOption>, name: string, optional?: boolean | null, label?: string | null, defaultValue?: string | null, };
+
+export type TemplateFunctionSelectOption = { name: string, value: string, };
+
+export type TemplateFunctionTextArg = { placeholder?: string | null, name: string, optional?: boolean | null, label?: string | null, defaultValue?: string | null, };

plugin-runtime-types/src/bindings/models.ts

@@ -0,0 +1,23 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type Environment = { model: "environment", id: string, workspaceId: string, createdAt: string, updatedAt: string, name: string, variables: Array<EnvironmentVariable>, };
+
+export type EnvironmentVariable = { enabled?: boolean, name: string, value: string, };
+
+export type Folder = { model: "folder", id: string, createdAt: string, updatedAt: string, workspaceId: string, folderId: string | null, name: string, sortPriority: number, };
+
+export type GrpcMetadataEntry = { enabled?: boolean, name: string, value: string, };
+
+export type GrpcRequest = { model: "grpc_request", id: string, createdAt: string, updatedAt: string, workspaceId: string, folderId: string | null, authenticationType: string | null, authentication: Record<string, any>, message: string, metadata: Array<GrpcMetadataEntry>, method: string | null, name: string, service: string | null, sortPriority: number, url: string, };
+
+export type HttpRequest = { model: "http_request", id: string, createdAt: string, updatedAt: string, workspaceId: string, folderId: string | null, authentication: Record<string, any>, authenticationType: string | null, body: Record<string, any>, bodyType: string | null, headers: Array<HttpRequestHeader>, method: string, name: string, sortPriority: number, url: string, urlParameters: Array<HttpUrlParameter>, };
+
+export type HttpRequestHeader = { enabled?: boolean, name: string, value: string, };
+
+export type HttpResponse = { model: "http_response", id: string, createdAt: string, updatedAt: string, workspaceId: string, requestId: string, bodyPath: string | null, contentLength: number | null, elapsed: number, elapsedHeaders: number, error: string | null, headers: Array<HttpResponseHeader>, remoteAddr: string | null, status: number, statusReason: string | null, url: string, version: string | null, };
+
+export type HttpResponseHeader = { name: string, value: string, };
+
+export type HttpUrlParameter = { enabled?: boolean, name: string, value: string, };
+
+export type Workspace = { model: "workspace", id: string, createdAt: string, updatedAt: string, name: string, description: string, variables: Array<EnvironmentVariable>, settingValidateCertificates: boolean, settingFollowRedirects: boolean, settingRequestTimeout: number, };

plugin-runtime-types/src/gen/CallHttpRequestActionArgs.ts

@@ -1,4 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { HttpRequest } from "./HttpRequest";
-
-export type CallHttpRequestActionArgs = { httpRequest: HttpRequest, };

plugin-runtime-types/src/gen/CallHttpRequestActionRequest.ts

@@ -1,4 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { CallHttpRequestActionArgs } from "./CallHttpRequestActionArgs";
-
-export type CallHttpRequestActionRequest = { key: string, pluginRefId: string, args: CallHttpRequestActionArgs, };

plugin-runtime-types/src/gen/CallTemplateFunctionArgs.ts

@@ -1,4 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { RenderPurpose } from "./RenderPurpose";
-
-export type CallTemplateFunctionArgs = { purpose: RenderPurpose, values: { [key: string]: string }, };

plugin-runtime-types/src/gen/CallTemplateFunctionRequest.ts

@@ -1,4 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { CallTemplateFunctionArgs } from "./CallTemplateFunctionArgs";
-
-export type CallTemplateFunctionRequest = { name: string, args: CallTemplateFunctionArgs, };

plugin-runtime-types/src/gen/Cookie.ts

@@ -1,5 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { CookieDomain } from "./CookieDomain";
-import type { CookieExpires } from "./CookieExpires";
-
-export type Cookie = { raw_cookie: string, domain: CookieDomain, expires: CookieExpires, path: [string, boolean], };

plugin-runtime-types/src/gen/CookieDomain.ts

@@ -1,3 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-
-export type CookieDomain = { "HostOnly": string } | { "Suffix": string } | "NotPresent" | "Empty";

plugin-runtime-types/src/gen/CookieJar.ts

@@ -1,4 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { Cookie } from "./Cookie";
-
-export type CookieJar = { id: string, model: "cookie_jar", createdAt: string, updatedAt: string, workspaceId: string, name: string, cookies: Array<Cookie>, };

plugin-runtime-types/src/gen/CopyTextRequest.ts

@@ -1,3 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-
-export type CopyTextRequest = { text: string, };

plugin-runtime-types/src/gen/EmptyResponse.ts

@@ -1,3 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-
-export type EmptyResponse = {};

plugin-runtime-types/src/gen/Environment.ts

@@ -1,4 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { EnvironmentVariable } from "./EnvironmentVariable";
-
-export type Environment = { id: string, workspaceId: string, model: "environment", createdAt: string, updatedAt: string, name: string, variables: Array<EnvironmentVariable>, };

plugin-runtime-types/src/gen/EnvironmentVariable.ts

@@ -1,3 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-
-export type EnvironmentVariable = { enabled?: boolean, name: string, value: string, };

plugin-runtime-types/src/gen/ExportHttpRequestRequest.ts

@@ -1,4 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { HttpRequest } from "./HttpRequest";
-
-export type ExportHttpRequestRequest = { httpRequest: HttpRequest, };

plugin-runtime-types/src/gen/ExportHttpRequestResponse.ts

@@ -1,3 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-
-export type ExportHttpRequestResponse = { content: string, };

plugin-runtime-types/src/gen/FilterRequest.ts

@@ -1,3 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-
-export type FilterRequest = { content: string, filter: string, };

plugin-runtime-types/src/gen/FilterResponse.ts

@@ -1,3 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-
-export type FilterResponse = { content: string, };

plugin-runtime-types/src/gen/FindHttpResponsesRequest.ts

@@ -1,3 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-
-export type FindHttpResponsesRequest = { requestId: string, limit: number | null, };

plugin-runtime-types/src/gen/FindHttpResponsesResponse.ts

@@ -1,4 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { HttpResponse } from "./HttpResponse";
-
-export type FindHttpResponsesResponse = { httpResponses: Array<HttpResponse>, };

plugin-runtime-types/src/gen/Folder.ts

@@ -1,3 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-
-export type Folder = { createdAt: string, updatedAt: string, id: string, workspaceId: string, folderId: string | null, model: "folder", name: string, sortPriority: number, };

plugin-runtime-types/src/gen/GetHttpRequestActionsRequest.ts

@@ -1,3 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-
-export type GetHttpRequestActionsRequest = Record<string, never>;

plugin-runtime-types/src/gen/GetHttpRequestActionsResponse.ts

@@ -1,4 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { HttpRequestAction } from "./HttpRequestAction";
-
-export type GetHttpRequestActionsResponse = { actions: Array<HttpRequestAction>, pluginRefId: string, };

plugin-runtime-types/src/gen/GetHttpRequestByIdRequest.ts

@@ -1,3 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-
-export type GetHttpRequestByIdRequest = { id: string, };

plugin-runtime-types/src/gen/GetHttpRequestByIdResponse.ts

@@ -1,4 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { HttpRequest } from "./HttpRequest";
-
-export type GetHttpRequestByIdResponse = { httpRequest: HttpRequest | null, };

plugin-runtime-types/src/gen/GetTemplateFunctionsResponse.ts

@@ -1,4 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { TemplateFunction } from "./TemplateFunction";
-
-export type GetTemplateFunctionsResponse = { functions: Array<TemplateFunction>, pluginRefId: string, };

plugin-runtime-types/src/gen/GrpcConnection.ts

@@ -1,3 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-
-export type GrpcConnection = { id: string, model: "grpc_connection", workspaceId: string, requestId: string, createdAt: string, updatedAt: string, service: string, method: string, elapsed: number, status: number, url: string, error: string | null, trailers: { [key: string]: string }, };

plugin-runtime-types/src/gen/GrpcEvent.ts

@@ -1,4 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { GrpcEventType } from "./GrpcEventType";
-
-export type GrpcEvent = { id: string, model: "grpc_event", workspaceId: string, requestId: string, connectionId: string, createdAt: string, updatedAt: string, content: string, eventType: GrpcEventType, metadata: { [key: string]: string }, status: number | null, error: string | null, };

plugin-runtime-types/src/gen/GrpcEventType.ts

@@ -1,3 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-
-export type GrpcEventType = "info" | "error" | "client_message" | "server_message" | "connection_start" | "connection_end";

plugin-runtime-types/src/gen/GrpcMetadataEntry.ts

@@ -1,3 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-
-export type GrpcMetadataEntry = { enabled?: boolean, name: string, value: string, };

plugin-runtime-types/src/gen/GrpcRequest.ts

@@ -1,4 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { GrpcMetadataEntry } from "./GrpcMetadataEntry";
-
-export type GrpcRequest = { id: string, model: "grpc_request", workspaceId: string, createdAt: string, updatedAt: string, folderId: string | null, name: string, sortPriority: number, url: string, service: string | null, method: string | null, message: string, authenticationType: string | null, authentication: Record<string, any>, metadata: Array<GrpcMetadataEntry>, };

plugin-runtime-types/src/gen/HttpRequest.ts

@@ -1,5 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { HttpRequestHeader } from "./HttpRequestHeader";
-import type { HttpUrlParameter } from "./HttpUrlParameter";
-
-export type HttpRequest = { createdAt: string, updatedAt: string, id: string, workspaceId: string, folderId: string | null, model: "http_request", sortPriority: number, name: string, url: string, urlParameters: Array<HttpUrlParameter>, method: string, body: Record<string, any>, bodyType: string | null, authentication: Record<string, any>, authenticationType: string | null, headers: Array<HttpRequestHeader>, };

plugin-runtime-types/src/gen/HttpRequestAction.ts

@@ -1,3 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-
-export type HttpRequestAction = { key: string, label: string, icon: string | null, };

plugin-runtime-types/src/gen/HttpRequestHeader.ts

@@ -1,3 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-
-export type HttpRequestHeader = { enabled?: boolean, name: string, value: string, };

plugin-runtime-types/src/gen/HttpResponse.ts

@@ -1,4 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { HttpResponseHeader } from "./HttpResponseHeader";
-
-export type HttpResponse = { id: string, model: "http_response", workspaceId: string, requestId: string, createdAt: string, updatedAt: string, error: string | null, url: string, contentLength: number | null, version: string | null, elapsed: number, elapsedHeaders: number, remoteAddr: string | null, status: number, statusReason: string | null, bodyPath: string | null, headers: Array<HttpResponseHeader>, };

plugin-runtime-types/src/gen/HttpResponseHeader.ts

@@ -1,3 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-
-export type HttpResponseHeader = { name: string, value: string, };

plugin-runtime-types/src/gen/HttpUrlParameter.ts

@@ -1,3 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-
-export type HttpUrlParameter = { enabled?: boolean, name: string, value: string, };

plugin-runtime-types/src/gen/ImportRequest.ts

@@ -1,3 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-
-export type ImportRequest = { content: string, };

plugin-runtime-types/src/gen/ImportResources.ts

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

plugin-runtime-types/src/gen/ImportResponse.ts

@@ -1,4 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { ImportResources } from "./ImportResources";
-
-export type ImportResponse = { resources: ImportResources, };

plugin-runtime-types/src/gen/InternalEvent.ts

@@ -1,4 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { InternalEventPayload } from "./InternalEventPayload";
-
-export type InternalEvent = { id: string, pluginRefId: string, replyId: string | null, payload: InternalEventPayload, };

plugin-runtime-types/src/gen/InternalEventPayload.ts

@@ -1,30 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { CallHttpRequestActionRequest } from "./CallHttpRequestActionRequest";
-import type { CallTemplateFunctionRequest } from "./CallTemplateFunctionRequest";
-import type { CallTemplateFunctionResponse } from "./CallTemplateFunctionResponse";
-import type { CopyTextRequest } from "./CopyTextRequest";
-import type { EmptyResponse } from "./EmptyResponse";
-import type { ExportHttpRequestRequest } from "./ExportHttpRequestRequest";
-import type { ExportHttpRequestResponse } from "./ExportHttpRequestResponse";
-import type { FilterRequest } from "./FilterRequest";
-import type { FilterResponse } from "./FilterResponse";
-import type { FindHttpResponsesRequest } from "./FindHttpResponsesRequest";
-import type { FindHttpResponsesResponse } from "./FindHttpResponsesResponse";
-import type { GetHttpRequestActionsRequest } from "./GetHttpRequestActionsRequest";
-import type { GetHttpRequestActionsResponse } from "./GetHttpRequestActionsResponse";
-import type { GetHttpRequestByIdRequest } from "./GetHttpRequestByIdRequest";
-import type { GetHttpRequestByIdResponse } from "./GetHttpRequestByIdResponse";
-import type { GetTemplateFunctionsResponse } from "./GetTemplateFunctionsResponse";
-import type { ImportRequest } from "./ImportRequest";
-import type { ImportResponse } from "./ImportResponse";
-import type { PluginBootRequest } from "./PluginBootRequest";
-import type { PluginBootResponse } from "./PluginBootResponse";
-import type { PluginReloadRequest } from "./PluginReloadRequest";
-import type { PluginReloadResponse } from "./PluginReloadResponse";
-import type { RenderHttpRequestRequest } from "./RenderHttpRequestRequest";
-import type { RenderHttpRequestResponse } from "./RenderHttpRequestResponse";
-import type { SendHttpRequestRequest } from "./SendHttpRequestRequest";
-import type { SendHttpRequestResponse } from "./SendHttpRequestResponse";
-import type { ShowToastRequest } from "./ShowToastRequest";
-
-export type InternalEventPayload = { "type": "boot_request" } & PluginBootRequest | { "type": "boot_response" } & PluginBootResponse | { "type": "reload_request" } & PluginReloadRequest | { "type": "reload_response" } & PluginReloadResponse | { "type": "import_request" } & ImportRequest | { "type": "import_response" } & ImportResponse | { "type": "filter_request" } & FilterRequest | { "type": "filter_response" } & FilterResponse | { "type": "export_http_request_request" } & ExportHttpRequestRequest | { "type": "export_http_request_response" } & ExportHttpRequestResponse | { "type": "send_http_request_request" } & SendHttpRequestRequest | { "type": "send_http_request_response" } & SendHttpRequestResponse | { "type": "get_http_request_actions_request" } & GetHttpRequestActionsRequest | { "type": "get_http_request_actions_response" } & GetHttpRequestActionsResponse | { "type": "call_http_request_action_request" } & CallHttpRequestActionRequest | { "type": "get_template_functions_request" } | { "type": "get_template_functions_response" } & GetTemplateFunctionsResponse | { "type": "call_template_function_request" } & CallTemplateFunctionRequest | { "type": "call_template_function_response" } & CallTemplateFunctionResponse | { "type": "copy_text_request" } & CopyTextRequest | { "type": "render_http_request_request" } & RenderHttpRequestRequest | { "type": "render_http_request_response" } & RenderHttpRequestResponse | { "type": "show_toast_request" } & ShowToastRequest | { "type": "get_http_request_by_id_request" } & GetHttpRequestByIdRequest | { "type": "get_http_request_by_id_response" } & GetHttpRequestByIdResponse | { "type": "find_http_responses_request" } & FindHttpResponsesRequest | { "type": "find_http_responses_response" } & FindHttpResponsesResponse | { "type": "empty_response" } & EmptyResponse;

plugin-runtime-types/src/gen/KeyValue.ts

@@ -1,3 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-
-export type KeyValue = { model: "key_value", createdAt: string, updatedAt: string, namespace: string, key: string, value: string, };

plugin-runtime-types/src/gen/Model.ts

@@ -1,15 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { CookieJar } from "./CookieJar";
-import type { Environment } from "./Environment";
-import type { Folder } from "./Folder";
-import type { GrpcConnection } from "./GrpcConnection";
-import type { GrpcEvent } from "./GrpcEvent";
-import type { GrpcRequest } from "./GrpcRequest";
-import type { HttpRequest } from "./HttpRequest";
-import type { HttpResponse } from "./HttpResponse";
-import type { KeyValue } from "./KeyValue";
-import type { Plugin } from "./Plugin";
-import type { Settings } from "./Settings";
-import type { Workspace } from "./Workspace";
-
-export type Model = Environment | Folder | GrpcConnection | GrpcEvent | GrpcRequest | HttpRequest | HttpResponse | KeyValue | Workspace | CookieJar | Settings | Plugin;

plugin-runtime-types/src/gen/Plugin.ts

@@ -1,3 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-
-export type Plugin = { id: string, model: "plugin", createdAt: string, updatedAt: string, checkedAt: string | null, directory: string, url: string | null, enabled: boolean, };

plugin-runtime-types/src/gen/PluginBootRequest.ts

@@ -1,3 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-
-export type PluginBootRequest = { dir: string, };

plugin-runtime-types/src/gen/PluginBootResponse.ts

@@ -1,3 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-
-export type PluginBootResponse = { name: string, version: string, capabilities: Array<string>, };

plugin-runtime-types/src/gen/PluginReloadRequest.ts

@@ -1,3 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-
-export type PluginReloadRequest = {};

plugin-runtime-types/src/gen/PluginReloadResponse.ts

@@ -1,3 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-
-export type PluginReloadResponse = {};

plugin-runtime-types/src/gen/RenderHttpRequestRequest.ts

@@ -1,5 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { HttpRequest } from "./HttpRequest";
-import type { RenderPurpose } from "./RenderPurpose";
-
-export type RenderHttpRequestRequest = { httpRequest: HttpRequest, purpose: RenderPurpose, };

plugin-runtime-types/src/gen/RenderHttpRequestResponse.ts

@@ -1,4 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { HttpRequest } from "./HttpRequest";
-
-export type RenderHttpRequestResponse = { httpRequest: HttpRequest, };

plugin-runtime-types/src/gen/RenderPurpose.ts

@@ -1,3 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-
-export type RenderPurpose = "send" | "preview";

plugin-runtime-types/src/gen/SendHttpRequestRequest.ts

@@ -1,4 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { HttpRequest } from "./HttpRequest";
-
-export type SendHttpRequestRequest = { httpRequest: HttpRequest, };

plugin-runtime-types/src/gen/SendHttpRequestResponse.ts

@@ -1,4 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { HttpResponse } from "./HttpResponse";
-
-export type SendHttpRequestResponse = { httpResponse: HttpResponse, };

plugin-runtime-types/src/gen/Settings.ts

@@ -1,3 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-
-export type Settings = { id: string, model: "settings", createdAt: string, updatedAt: string, theme: string, appearance: string, themeDark: string, themeLight: string, updateChannel: string, interfaceFontSize: number, interfaceScale: number, editorFontSize: number, editorSoftWrap: boolean, telemetry: boolean, openWorkspaceNewWindow: boolean | null, };

plugin-runtime-types/src/gen/ShowToastRequest.ts

@@ -1,4 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { ToastVariant } from "./ToastVariant";
-
-export type ShowToastRequest = { message: string, variant: ToastVariant, };

plugin-runtime-types/src/gen/TemplateFunction.ts

@@ -1,4 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { TemplateFunctionArg } from "./TemplateFunctionArg";
-
-export type TemplateFunction = { name: string, args: Array<TemplateFunctionArg>, };

plugin-runtime-types/src/gen/TemplateFunctionArg.ts

@@ -1,7 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { TemplateFunctionCheckboxArg } from "./TemplateFunctionCheckboxArg";
-import type { TemplateFunctionHttpRequestArg } from "./TemplateFunctionHttpRequestArg";
-import type { TemplateFunctionSelectArg } from "./TemplateFunctionSelectArg";
-import type { TemplateFunctionTextArg } from "./TemplateFunctionTextArg";
-
-export type TemplateFunctionArg = { "type": "text" } & TemplateFunctionTextArg | { "type": "select" } & TemplateFunctionSelectArg | { "type": "checkbox" } & TemplateFunctionCheckboxArg | { "type": "http_request" } & TemplateFunctionHttpRequestArg;

plugin-runtime-types/src/gen/TemplateFunctionBaseArg.ts

@@ -1,3 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-
-export type TemplateFunctionBaseArg = { name: string, optional?: boolean | null, label?: string | null, defaultValue?: string | null, };

plugin-runtime-types/src/gen/TemplateFunctionCheckboxArg.ts

@@ -1,3 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-
-export type TemplateFunctionCheckboxArg = { name: string, optional?: boolean | null, label?: string | null, defaultValue?: string | null, };

plugin-runtime-types/src/gen/TemplateFunctionHttpRequestArg.ts

@@ -1,3 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-
-export type TemplateFunctionHttpRequestArg = { name: string, optional?: boolean | null, label?: string | null, defaultValue?: string | null, };

plugin-runtime-types/src/gen/TemplateFunctionSelectArg.ts

@@ -1,4 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { TemplateFunctionSelectOption } from "./TemplateFunctionSelectOption";
-
-export type TemplateFunctionSelectArg = { options: Array<TemplateFunctionSelectOption>, name: string, optional?: boolean | null, label?: string | null, defaultValue?: string | null, };

plugin-runtime-types/src/gen/TemplateFunctionSelectOption.ts

@@ -1,3 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-
-export type TemplateFunctionSelectOption = { name: string, value: string, };

plugin-runtime-types/src/gen/TemplateFunctionTextArg.ts

@@ -1,3 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-
-export type TemplateFunctionTextArg = { placeholder?: string | null, name: string, optional?: boolean | null, label?: string | null, defaultValue?: string | null, };

plugin-runtime-types/src/gen/ToastVariant.ts

@@ -1,3 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-
-export type ToastVariant = "custom" | "copied" | "success" | "info" | "warning" | "error";

plugin-runtime-types/src/gen/Workspace.ts

@@ -1,4 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { EnvironmentVariable } from "./EnvironmentVariable";
-
-export type Workspace = { id: string, model: "workspace", createdAt: string, updatedAt: string, name: string, description: string, variables: Array<EnvironmentVariable>, settingValidateCertificates: boolean, settingFollowRedirects: boolean, settingRequestTimeout: number, };

plugin-runtime-types/src/helpers.ts

@@ -1,2 +1 @@
 export type AtLeast<T, K extends keyof T> = Partial<T> & Pick<T, K>;
-export type OneOrMany<T> = T[] | T;

plugin-runtime-types/src/index.ts

@@ -1,68 +1,5 @@
 export type * from './plugins';
 export type * from './themes';
 
-// TODO: The next ts-rs release includes the ability to put everything in 1 file!
-export * from './gen/CallHttpRequestActionArgs';
-export * from './gen/CallHttpRequestActionRequest';
-export * from './gen/CallTemplateFunctionRequest';
-export * from './gen/CallTemplateFunctionResponse';
-export * from './gen/CallTemplateFunctionArgs';
-export * from './gen/Cookie';
-export * from './gen/CookieDomain';
-export * from './gen/CookieExpires';
-export * from './gen/CookieJar';
-export * from './gen/CopyTextRequest';
-export * from './gen/EmptyResponse';
-export * from './gen/Environment';
-export * from './gen/EnvironmentVariable';
-export * from './gen/ExportHttpRequestRequest';
-export * from './gen/ExportHttpRequestResponse';
-export * from './gen/FilterRequest';
-export * from './gen/FilterResponse';
-export * from './gen/Folder';
-export * from './gen/FindHttpResponsesRequest';
-export * from './gen/FindHttpResponsesResponse';
-export * from './gen/GetHttpRequestActionsResponse';
-export * from './gen/GetHttpRequestByIdRequest';
-export * from './gen/GetHttpRequestByIdResponse';
-export * from './gen/GetTemplateFunctionsResponse';
-export * from './gen/GrpcConnection';
-export * from './gen/GrpcEvent';
-export * from './gen/GrpcMetadataEntry';
-export * from './gen/GrpcRequest';
-export * from './gen/HttpRequest';
-export * from './gen/HttpRequestAction';
-export * from './gen/HttpRequestHeader';
-export * from './gen/HttpResponse';
-export * from './gen/HttpResponseHeader';
-export * from './gen/HttpUrlParameter';
-export * from './gen/ImportRequest';
-export * from './gen/ImportResources';
-export * from './gen/ImportResponse';
-export * from './gen/InternalEvent';
-export * from './gen/InternalEventPayload';
-export * from './gen/KeyValue';
-export * from './gen/Model';
-export * from './gen/PluginBootRequest';
-export * from './gen/PluginBootResponse';
-export * from './gen/PluginReloadRequest';
-export * from './gen/PluginReloadResponse';
-export * from './gen/RenderHttpRequestRequest';
-export * from './gen/RenderHttpRequestResponse';
-export * from './gen/RenderPurpose';
-export * from './gen/SendHttpRequestRequest';
-export * from './gen/SendHttpRequestResponse';
-export * from './gen/SendHttpRequestResponse';
-export * from './gen/Settings';
-export * from './gen/ShowToastRequest';
-export * from './gen/TemplateFunction';
-export * from './gen/TemplateFunctionArg';
-export * from './gen/TemplateFunctionBaseArg';
-export * from './gen/TemplateFunctionCheckboxArg';
-export * from './gen/TemplateFunctionHttpRequestArg';
-export * from './gen/TemplateFunctionSelectArg';
-export * from './gen/TemplateFunctionSelectOption';
-export * from './gen/TemplateFunctionTextArg';
-export * from './gen/ToastVariant';
-export * from './gen/Workspace';
-export * from './gen/Plugin';
+export * from './bindings/models';
+export * from './bindings/events';

plugin-runtime-types/src/plugins/Context.ts

@@ -1,12 +1,14 @@
-import { FindHttpResponsesRequest } from '../gen/FindHttpResponsesRequest';
-import { FindHttpResponsesResponse } from '../gen/FindHttpResponsesResponse';
-import { GetHttpRequestByIdRequest } from '../gen/GetHttpRequestByIdRequest';
-import { GetHttpRequestByIdResponse } from '../gen/GetHttpRequestByIdResponse';
-import { RenderHttpRequestRequest } from '../gen/RenderHttpRequestRequest';
-import { RenderHttpRequestResponse } from '../gen/RenderHttpRequestResponse';
-import { SendHttpRequestRequest } from '../gen/SendHttpRequestRequest';
-import { SendHttpRequestResponse } from '../gen/SendHttpRequestResponse';
-import { ShowToastRequest } from '../gen/ShowToastRequest';
+import {
+  FindHttpResponsesRequest,
+  FindHttpResponsesResponse,
+  GetHttpRequestByIdRequest,
+  GetHttpRequestByIdResponse,
+  RenderHttpRequestRequest,
+  RenderHttpRequestResponse,
+  SendHttpRequestRequest,
+  SendHttpRequestResponse,
+  ShowToastRequest,
+} from '..';
 
 export type Context = {
   clipboard: {

plugin-runtime-types/src/plugins/HttpRequestActionPlugin.ts

@@ -1,5 +1,4 @@
-import { CallHttpRequestActionArgs } from '../gen/CallHttpRequestActionArgs';
-import { HttpRequestAction } from '../gen/HttpRequestAction';
+import { CallHttpRequestActionArgs, HttpRequestAction } from '..';
 import { Context } from './Context';
 
 export type HttpRequestActionPlugin = HttpRequestAction & {

plugin-runtime-types/src/plugins/ImporterPlugin.ts

@@ -1,7 +1,4 @@
-import { Environment } from '../gen/Environment';
-import { Folder } from '../gen/Folder';
-import { HttpRequest } from '../gen/HttpRequest';
-import { Workspace } from '../gen/Workspace';
+import { Environment, Folder, HttpRequest, Workspace } from '..';
 import { AtLeast } from '../helpers';
 import { Context } from './Context';
 

plugin-runtime-types/src/plugins/TemplateFunctionPlugin.ts

@@ -1,5 +1,4 @@
-import { CallTemplateFunctionArgs } from '../gen/CallTemplateFunctionArgs';
-import { TemplateFunction } from '../gen/TemplateFunction';
+import { CallTemplateFunctionArgs, TemplateFunction } from '..';
 import { Context } from './Context';
 
 export type TemplateFunctionPlugin = TemplateFunction & {

plugin-runtime/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "@yaak/plugin-runtime",
+  "name": "@yaakapp-internal/plugin-runtime",
   "scripts": {
     "dev": "nodemon",
     "build": "run-p build:*",

plugin-runtime/src/PluginHandle.ts

@@ -18,6 +18,10 @@ export class PluginHandle {
     this.#worker.postMessage(event);
   }
 
+  async terminate() {
+    await this.#worker.terminate();
+  }
+
   #createWorker(): Worker {
     const workerPath = process.env.YAAK_WORKER_PATH ?? path.join(__dirname, 'index.worker.cjs');
     const worker = new Worker(workerPath, {

plugin-runtime/src/index.ts

@@ -22,13 +22,19 @@ const plugins: Record<string, PluginHandle> = {};
         plugins[pluginEvent.pluginRefId] = plugin;
       }
 
-      // Once booted, forward all events to plugin's worker
+      // Once booted, forward all events to the plugin worker
       const plugin = plugins[pluginEvent.pluginRefId];
       if (!plugin) {
         console.warn('Failed to get plugin for event by', pluginEvent.pluginRefId);
         continue;
       }
 
+      if (pluginEvent.payload.type === 'terminate_request') {
+        await plugin.terminate();
+        console.log('Terminated plugin worker', pluginEvent.pluginRefId);
+        delete plugins[pluginEvent.pluginRefId];
+      }
+
       plugin.sendToWorker(pluginEvent);
     }
     console.log('Stream ended');

plugin-runtime/src/index.worker.ts

@@ -155,6 +155,14 @@ async function initialize() {
         return;
       }
 
+      if (payload.type === 'terminate_request') {
+        const payload: InternalEventPayload = {
+          type: 'terminate_response',
+        };
+        sendPayload(payload, replyId);
+        return;
+      }
+
       if (payload.type === 'import_request' && typeof mod.pluginHookImport === 'function') {
         const reply: ImportResponse | null = await mod.pluginHookImport(ctx, payload.content);
         if (reply != null) {
@@ -313,8 +321,6 @@ function watchFile(filepath: string, cb: (filepath: string) => void) {
     const stat = statSync(filepath);
     if (stat.mtimeMs !== watchedFiles[filepath]?.mtimeMs) {
       cb(filepath);
-    } else {
-      console.log('SKIPPING SAME FILE STAT', filepath, stat);
     }
     watchedFiles[filepath] = stat;
   });

src-tauri/Cargo.lock

@@ -5773,13 +5773,12 @@ checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1"
 
 [[package]]
 name = "tauri"
-version = "2.0.0-rc.12"
+version = "2.0.0-rc.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "65e5d4a319f11ae72c77d0f4dbd9703ab6b401eb91d1ca88d89c33d13d4ea20c"
+checksum = "eb3c3b1c7ac5b72d59da307b84af900a0098c74c9d7369f65018cd8ec0eb50fb"
 dependencies = [
  "anyhow",
  "bytes",
- "cocoa 0.26.0",
  "dirs",
  "dunce",
  "embed_plist",
@@ -5795,7 +5794,9 @@ dependencies = [
  "log",
  "mime",
  "muda",
- "objc",
+ "objc2",
+ "objc2-app-kit",
+ "objc2-foundation",
  "percent-encoding",
  "plist",
  "raw-window-handle",
@@ -5824,9 +5825,9 @@ dependencies = [
 
 [[package]]
 name = "tauri-build"
-version = "2.0.0-rc.11"
+version = "2.0.0-rc.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "148441d64674b2885c1ba5baf3ae61662bb8753859ffcfb541962cbc6b847f39"
+checksum = "6ff5713e81e02e0b99f5219b275abbd7d2c0cc0f30180e25b1b650e08feeac63"
 dependencies = [
  "anyhow",
  "cargo_toml",
@@ -5846,9 +5847,9 @@ dependencies = [
 
 [[package]]
 name = "tauri-codegen"
-version = "2.0.0-rc.11"
+version = "2.0.0-rc.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72a15c3f9282c82871c69ddb65d02ae552738bbac848c8adcab521bf14d8b9e6"
+checksum = "5370f2591dcc93d4ff08d9dd168f5097f79b34e859883586a409c627544190e3"
 dependencies = [
  "base64 0.22.1",
  "brotli",
@@ -5873,9 +5874,9 @@ dependencies = [
 
 [[package]]
 name = "tauri-macros"
-version = "2.0.0-rc.10"
+version = "2.0.0-rc.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f12d1aa317bec56f78388cf6012d788876d838595a48f95cbd7835642db356a0"
+checksum = "19442dc8ee002ab1926586f6aecb90114f3a1226766008b0c9ac2d9fec9eeb7e"
 dependencies = [
  "heck 0.5.0",
  "proc-macro2",
@@ -6049,9 +6050,9 @@ dependencies = [
 
 [[package]]
 name = "tauri-plugin-window-state"
-version = "2.0.0-rc.4"
+version = "2.0.0-rc.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67c9b841c8164b949eac9e4fe8d56a23ed5e8ef0ac1c52e26a500709f7a50e50"
+checksum = "2221224863eced96d800407f7ed8b8e6bd8f329e834b7b975bb553123fb79af0"
 dependencies = [
  "bitflags 2.6.0",
  "log",
@@ -6064,9 +6065,9 @@ dependencies = [
 
 [[package]]
 name = "tauri-runtime"
-version = "2.0.0-rc.11"
+version = "2.0.0-rc.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "389f78c8e8e6eff3897d8d9581087943b5976ea96a0ab5036be691f28c2b0df0"
+checksum = "c5f38d8aaa1e81d20e8e208e3e317f81b59fb75c530fbae8a90e72d02001d687"
 dependencies = [
  "dpi",
  "gtk",
@@ -6083,15 +6084,17 @@ dependencies = [
 
 [[package]]
 name = "tauri-runtime-wry"
-version = "2.0.0-rc.11"
+version = "2.0.0-rc.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "466c418aef2ddc7d31173a5b00bfae3df9b58ed66644339f3ca55008bfc54f25"
+checksum = "cf1ef5171e14c8fe3b5a63e75004c20d057747bc3e7fdc5f8ded625f0b29f5c7"
 dependencies = [
- "cocoa 0.26.0",
  "gtk",
  "http 1.1.0",
  "jni",
  "log",
+ "objc2",
+ "objc2-app-kit",
+ "objc2-foundation",
  "percent-encoding",
  "raw-window-handle",
  "softbuffer",
@@ -6107,9 +6110,9 @@ dependencies = [
 
 [[package]]
 name = "tauri-utils"
-version = "2.0.0-rc.11"
+version = "2.0.0-rc.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3019641087c9039b57ebfca95fa42a93c07056845b7d8d57c8966061bcee83b4"
+checksum = "31fe4c9148e1b35225e1c00753f24b517ce00041d02eb4b4d6fd10613a47736c"
 dependencies = [
  "brotli",
  "cargo_metadata",
@@ -6637,11 +6640,12 @@ checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
 
 [[package]]
 name = "ts-rs"
-version = "9.0.1"
+version = "10.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b44017f9f875786e543595076374b9ef7d13465a518dd93d6ccdbf5b432dde8c"
+checksum = "3a2f31991cee3dce1ca4f929a8a04fdd11fd8801aac0f2030b0fa8a0a3fef6b9"
 dependencies = [
  "chrono",
+ "lazy_static",
  "serde_json",
  "thiserror",
  "ts-rs-macros",
@@ -6649,9 +6653,9 @@ dependencies = [
 
 [[package]]
 name = "ts-rs-macros"
-version = "9.0.1"
+version = "10.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c88cc88fd23b5a04528f3a8436024f20010a16ec18eb23c164b1242f65860130"
+checksum = "0ea0b99e8ec44abd6f94a18f28f7934437809dd062820797c52401298116f70e"
 dependencies = [
  "proc-macro2",
  "quote",

src-tauri/Cargo.toml

@@ -16,7 +16,7 @@ crate-type = ["staticlib", "cdylib", "lib"]
 strip = true  # Automatically strip symbols from the binary.
 
 [build-dependencies]
-tauri-build = { version = "2.0.0-rc.0", features = [] }
+tauri-build = { version = "2.0.0-rc.12", features = [] }
 
 [target.'cfg(target_os = "macos")'.dependencies]
 objc = "0.2.7"
@@ -52,7 +52,7 @@ tauri-plugin-fs = "2.0.0-rc.5"
 tauri-plugin-log = { version = "2.0.0-rc.2", features = ["colored"] }
 tauri-plugin-os = "2.0.0-rc.1"
 tauri-plugin-updater = "2.0.0-rc.3"
-tauri-plugin-window-state = "2.0.0-rc.4"
+tauri-plugin-window-state = "2.0.0-rc.5"
 tokio = { version = "1.36.0", features = ["sync"] }
 tokio-stream = "0.1.15"
 uuid = "1.7.0"
@@ -64,4 +64,4 @@ urlencoding = "2.1.3"
 yaak_models = { path = "yaak_models" }
 yaak_plugin_runtime = { path = "yaak_plugin_runtime" }
 tauri-plugin-shell = "2.0.0-rc.3"
-tauri = { version = "2.0.0-rc.12", features = ["devtools", "protocol-asset"] }
+tauri = { version = "2.0.0-rc.15", features = ["devtools", "protocol-asset"] }