Fix plugin (again)

Fixes #6

.eslintrc.cjs

@@ -1,31 +1,37 @@
 module.exports = {
-    extends: [
-        'eslint:recommended',
-        'plugin:react/recommended',
-        'plugin:import/recommended',
-        'plugin:jsx-a11y/recommended',
-        'plugin:@typescript-eslint/recommended',
-        'eslint-config-prettier',
-    ],
-    ignorePatterns: ['src-tauri/**/*'],
-    settings: {
-        react: {
-            version: 'detect',
-        },
-        'import/resolver': {
-            node: {
-                paths: ['src-web'],
-                extensions: ['.js', '.jsx', '.ts', '.tsx'],
-            },
-        },
-    },
-    rules: {
-        "jsx-a11y/no-autofocus": "warn",
-        "react/react-in-jsx-scope": "off",
-        "@typescript-eslint/consistent-type-imports": ["error", {
-            prefer: "type-imports",
-            disallowTypeAnnotations: true,
-            fixStyle: "separate-type-imports",
-        }]
+  extends: [
+    "eslint:recommended",
+    "plugin:react/recommended",
+    "plugin:react-hooks/recommended",
+    "plugin:import/recommended",
+    "plugin:jsx-a11y/recommended",
+    "plugin:@typescript-eslint/recommended",
+    "eslint-config-prettier"
+  ],
+  parser: "@typescript-eslint/parser",
+  parserOptions: {
+    project: ["./tsconfig.json"]
+  },
+  ignorePatterns: ["src-tauri/**/*", "plugins/**/*"],
+  settings: {
+    react: {
+      version: "detect"
     },
+    "import/resolver": {
+      node: {
+        paths: ["src-web"],
+        extensions: [".ts", ".tsx"]
+      }
+    }
+  },
+  rules: {
+    "jsx-a11y/no-autofocus": "off",
+    "react/react-in-jsx-scope": "off",
+    "import/no-unresolved": "off",
+    "@typescript-eslint/consistent-type-imports": ["error", {
+      prefer: "type-imports",
+      disallowTypeAnnotations: true,
+      fixStyle: "separate-type-imports"
+    }]
+  }
 };

.github/workflows/artifacts.yml

@@ -3,19 +3,30 @@ on:
   push:
     tags: [ v* ]
 
+permissions: write-all
+
 jobs:
   build-artifacts:
-    runs-on: ${{ matrix.platform }}
-
     strategy:
       fail-fast: false
       matrix:
-#        platform: [ ubuntu-latest, macos-latest, windows-latest ]
-        platform: [ macos-latest ]
+        include:
+          - os: macos-12
+            target: aarch64-apple-darwin
+          - os: macos-latest
+            target: x86_64-apple-darwin
+          - os: windows-2022
+            target: x86_64-pc-windows-msvc
+          - os: ubuntu-20.04
+            target: x86_64-unknown-linux-gnu
+
+    runs-on: ${{ matrix.os }}
 
     steps:
       - uses: actions/checkout@v3
       - uses: dtolnay/rust-toolchain@stable
+        with:
+          targets: ${{ matrix.target }}
       - name: Cache Rust
         uses: actions/cache@v2
         with:
@@ -29,7 +40,7 @@ jobs:
           node-version: 18
           cache: 'npm'
       - name: install dependencies (ubuntu only)
-        if: matrix.platform == 'ubuntu-20.04'
+        if: matrix.os == 'ubuntu-20.04'
         run: |
           sudo apt-get update
           sudo apt-get install -y libgtk-3-dev libwebkit2gtk-4.0-dev libappindicator3-dev librsvg2-dev patchelf
@@ -37,14 +48,24 @@ jobs:
         run: npm ci
       - name: Run tests
         run: npm test
-      - uses: tauri-apps/tauri-action@v0
+      # Pin dev version to get non-default targets
+      # https://github.com/tauri-apps/tauri-action/issues/356
+      - uses: tauri-apps/tauri-action@dev
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           TAURI_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }}
           TAURI_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }}
+          ENABLE_CODE_SIGNING: ${{ secrets.APPLE_CERTIFICATE }}
+          APPLE_CERTIFICATE: ${{ secrets.APPLE_CERTIFICATE }}
+          APPLE_CERTIFICATE_PASSWORD: ${{ secrets.APPLE_CERTIFICATE_PASSWORD }}
+          APPLE_SIGNING_IDENTITY: ${{ secrets.APPLE_SIGNING_IDENTITY }}
+          APPLE_ID: ${{ secrets.APPLE_ID }}
+          APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }}
+          APPLE_PASSWORD: ${{ secrets.APPLE_PASSWORD }}
         with:
-          tagName: v__VERSION__
-          releaseName: 'App v__VERSION__'
-          releaseBody: 'See the assets to download this version and install.'
+          tagName: 'v__VERSION__'
+          releaseName: 'Release __VERSION__'
+          releaseBody: '<!-- Release Notes -->'
           releaseDraft: true
           prerelease: false
+          args: '--target ${{ matrix.target }}'

.gitignore

@@ -22,5 +22,6 @@ dist-ssr
 *.njsproj
 *.sln
 *.sw?
+.eslintcache
 
 *.sqlite

.husky/.gitignore

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

.husky/pre-commit

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

.nvmrc

@@ -1 +1 @@
-18
+20

.run/Dev Desktop.run.xml

@@ -6,9 +6,7 @@
       <script value="tauri-dev" />
     </scripts>
     <node-interpreter value="project" />
-    <envs>
-      <env name="DATABASE_URL" value="sqlite://$USER_HOME$/Library/Application%20Support/co.schier.yaak/db.sqlite" />
-    </envs>
+    <envs />
     <method v="2" />
   </configuration>
-</component>
+</component>

.sqllsrc.json

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

Makefile

@@ -0,0 +1,13 @@
+.PHONY: sqlx-prepare, dev, migrate, build
+
+sqlx-prepare:
+	cd src-tauri && cargo sqlx prepare --database-url 'sqlite://db.sqlite'
+
+dev:
+	npm run tauri-dev
+
+migrate:
+	cd src-tauri && cargo sqlx migrate run --database-url 'sqlite://db.sqlite?mode=rw'
+
+build:
+	./node_modules/.bin/tauri build

README.md

@@ -1,3 +1,16 @@
-# Tauri REST Client
+# Yaak Network Toolkit
 
-It's a REST client, yo.
+The most fun you'll ever have working with APIs.
+
+## Common Commands
+
+```sh
+# Start dev app
+npm run tauri-dev
+
+# Migration commands
+cd src-tauri
+cargo sqlx migrate add ${MIGRATION_NAME}
+cargo sqlx migrate run --database-url 'sqlite://db.sqlite?mode=rw'
+cargo sqlx prepare --database-url 'sqlite://db.sqlite'
+```

index.html

@@ -1,16 +1,28 @@
 <!DOCTYPE html>
 <html lang="en">
-  <head>
-    <meta charset="UTF-8" />
-    <link rel="icon" type="image/svg+xml" href="/vite.svg" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>Tauri + React + TS</title>
-  </head>
+<head>
+  <meta charset="UTF-8" />
+  <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+  <title>Yaak App</title>
+<!--  <script src="http://localhost:8097"></script>-->
+  <style>
+      body {
+          background-color: white;
+      }
 
-  <body>
-    <div id="root"></div>
-    <div id="cm-portal" class="cm-portal" style="pointer-events: auto"></div>
-    <div id="radix-portal" class="cm-portal"></div>
-    <script type="module" src="/src-web/main.tsx"></script>
-  </body>
+      @media (prefers-color-scheme: dark) {
+          body {
+              background-color: black;
+          }
+      }
+  </style>
+</head>
+
+<body>
+<div id="root"></div>
+<div id="cm-portal" class="cm-portal"></div>
+<div id="react-portal"></div>
+<div id="radix-portal" class="cm-portal"></div>
+<script type="module" src="/src-web/main.tsx"></script>
+</body>
 </html>

package.json

@@ -1,22 +1,23 @@
 {
-  "name": "tauri-app",
+  "name": "yaak-app",
   "private": true,
   "version": "0.0.0",
   "type": "module",
   "scripts": {
-    "tauri-dev": "tauri dev",
-    "tauri-build": "npm run build:icon && tauri build",
+    "tauri-dev": "YAAK_ENV=development tauri dev",
+    "tauri-build": "tauri build",
+    "tauri": "tauri",
     "build": "npm run build:frontend",
     "dev": "vite dev",
     "lint": "tsc && eslint . --ext .ts,.tsx",
     "build:icon": "tauri icon src-tauri/icons/icon.png",
     "build:frontend": "vite build",
     "test": "vitest",
-    "coverage": "vitest run --coverage"
+    "coverage": "vitest run --coverage",
+    "prepare": "husky install"
   },
   "dependencies": {
     "@codemirror/commands": "^6.2.1",
-    "@codemirror/lang-html": "^6.4.2",
     "@codemirror/lang-javascript": "^6.1.4",
     "@codemirror/lang-json": "^6.0.1",
     "@codemirror/lang-xml": "^6.0.2",
@@ -25,48 +26,66 @@
     "@lezer/generator": "^1.2.2",
     "@lezer/highlight": "^1.1.3",
     "@lezer/lr": "^1.3.3",
-    "@radix-ui/react-dialog": "^1.0.2",
-    "@radix-ui/react-dropdown-menu": "^2.0.2",
     "@radix-ui/react-icons": "^1.2.0",
-    "@radix-ui/react-popover": "1.0.3",
-    "@radix-ui/react-scroll-area": "^1.0.2",
-    "@radix-ui/react-separator": "^1.0.1",
-    "@radix-ui/react-tabs": "^1.0.3",
-    "@tanstack/react-query": "^4.24.10",
-    "@tauri-apps/api": "^1.2.0",
+    "@react-hook/resize-observer": "^1.2.6",
+    "@tailwindcss/container-queries": "^0.1.0",
+    "@tanstack/query-sync-storage-persister": "^4.27.1",
+    "@tanstack/react-query": "^4.28.0",
+    "@tanstack/react-query-devtools": "^4.28.0",
+    "@tanstack/react-query-persist-client": "^4.28.0",
+    "@tauri-apps/api": "^1.5.1",
+    "buffer": "^6.0.3",
     "classnames": "^2.3.2",
-    "cm6-graphql": "^0.0.4-canary-b30a2325.0",
+    "cm6-graphql": "^0.0.9",
     "codemirror": "^6.0.1",
+    "focus-trap-react": "^10.1.1",
     "format-graphql": "^1.4.0",
     "framer-motion": "^9.0.4",
+    "papaparse": "^5.4.1",
     "parse-color": "^1.0.0",
-    "preact-router": "^4.1.0",
+    "react": "^18.2.0",
+    "react-dnd": "^16.0.1",
+    "react-dnd-html5-backend": "^16.0.1",
+    "react-dom": "^18.2.0",
     "react-helmet-async": "^1.3.0",
-    "react-use": "^17.4.0"
+    "react-router-dom": "^6.8.1",
+    "react-use": "^17.4.0",
+    "uuid": "^9.0.0"
   },
   "devDependencies": {
-    "@preact/preset-vite": "^2.5.0",
     "@tailwindcss/nesting": "^0.0.0-insiders.565cd3e",
-    "@tauri-apps/cli": "^1.2.2",
+    "@tauri-apps/cli": "^1.5.4",
     "@types/node": "^18.7.10",
+    "@types/papaparse": "^5.3.7",
     "@types/parse-color": "^1.0.1",
     "@types/parse-json": "^4.0.0",
-    "@typescript-eslint/eslint-plugin": "^5.52.0",
-    "@typescript-eslint/parser": "^5.52.0",
+    "@types/react": "^18.0.31",
+    "@types/react-dom": "^18.0.11",
+    "@types/uuid": "^9.0.1",
+    "@typescript-eslint/eslint-plugin": "^5.57.0",
+    "@typescript-eslint/parser": "^5.57.0",
+    "@vitejs/plugin-react": "^3.1.0",
     "autoprefixer": "^10.4.13",
-    "concurrently": "^7.6.0",
     "eslint": "^8.34.0",
     "eslint-config-prettier": "^8.6.0",
     "eslint-plugin-import": "^2.27.5",
     "eslint-plugin-jsx-a11y": "^6.7.1",
     "eslint-plugin-react": "^7.32.2",
+    "eslint-plugin-react-hooks": "^4.6.0",
+    "husky": "^8.0.3",
+    "lint-staged": "^15.0.2",
     "postcss": "^8.4.21",
     "postcss-nesting": "^11.2.1",
     "prettier": "^2.8.4",
     "tailwindcss": "^3.2.7",
-    "typescript": "^4.6.4",
+    "typescript": "^5.0.2",
     "vite": "^4.0.0",
+    "vite-plugin-svgr": "^2.4.0",
     "vite-plugin-top-level-await": "^1.2.4",
     "vitest": "^0.29.2"
+  },
+  "lint-staged": {
+    "*.{ts,tsx}": "eslint --cache --fix",
+    "*.{js,css,md}": "prettier --write"
   }
 }

rustfmt.toml

@@ -0,0 +1 @@
+edition = "2018"

src-tauri/Cargo.toml

@@ -7,29 +7,44 @@ license = "MIT"
 repository = "https://github.com/gschier/yaak-app"
 edition = "2021"
 
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+[profile.release]
+strip = true  # Automatically strip symbols from the binary.
 
 [build-dependencies]
 tauri-build = { version = "1.2", features = [] }
 
 [target.'cfg(target_os = "macos")'.dependencies]
-objc = { version = "0.2.7" }
-cocoa = { version = "0.24.1" }
+objc = "0.2.7"
+cocoa = "0.25.0"
 
 [dependencies]
-serde_json = { version = "1.0", features = ["raw_value"] }
-serde = { version = "1.0", features = ["derive"] }
-tauri = { version = "1.2", features = ["config-toml", "devtools", "shell-open", "system-tray", "updater", "window-start-dragging"] }
-http = { version = "0.2.8" }
-reqwest = { version = "0.11.14", features = ["json"] }
-tokio = { version = "1.25.0", features = ["sync"] }
-futures = { version = "0.3.26" }
-deno_core = { version = "0.174.0" }
-deno_ast = { version = "0.24.0", features = ["transpiling"] }
-sqlx = { version = "0.6.2", features = ["sqlite", "runtime-tokio-rustls", "json", "chrono", "time", "offline"] }
-uuid = { version = "1.3.0" }
-rand = { version = "0.8.5" }
+base64 = "0.21.0"
+boa_engine = "0.17.3"
+boa_runtime = "0.17.3"
 chrono = { version = "0.4.23", features = ["serde"] }
+futures = "0.3.26"
+http = "0.2.8"
+rand = "0.8.5"
+reqwest = { version = "0.11.14", features = ["json"] }
+serde = { version = "1.0", features = ["derive"] }
+serde_json = { version = "1.0", features = ["raw_value"] }
+sqlx = { version = "0.6.2", features = ["sqlite", "runtime-tokio-rustls", "json", "chrono", "time", "offline"] }
+tauri = { version = "1.3", features = [
+    "cli",
+    "config-toml",
+    "devtools",
+    "fs-read-file",
+    "os-all",
+    "protocol-asset",
+    "shell-open",
+    "system-tray",
+    "updater",
+    "window-start-dragging",
+    "dialog-open",
+] }
+tauri-plugin-window-state = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v1" }
+tokio = { version = "1.25.0", features = ["sync"] }
+uuid = "1.3.0"
 
 [features]
 # by default Tauri runs in production mode

src-tauri/macos/entitlements.plist

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+    <key>com.apple.security.cs.allow-unsigned-executable-memory</key>
+    <true/>
+</dict>
+</plist>

src-tauri/migrations/20230225181302_init.sql

@@ -1,39 +1,65 @@
+CREATE TABLE key_values
+(
+    model      TEXT     DEFAULT 'key_value'       NOT NULL,
+    created_at DATETIME DEFAULT CURRENT_TIMESTAMP NOT NULL,
+    updated_at DATETIME DEFAULT CURRENT_TIMESTAMP NOT NULL,
+    deleted_at DATETIME,
+    namespace  TEXT                               NOT NULL,
+    key        TEXT                               NOT NULL,
+    value      TEXT                               NOT NULL,
+    PRIMARY KEY (namespace, key)
+);
+
 CREATE TABLE workspaces
 (
-    id          TEXT     NOT NULL PRIMARY KEY,
-    created_at  DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
-    updated_at  DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    id          TEXT                               NOT NULL
+        PRIMARY KEY,
+    model       TEXT     DEFAULT 'workspace'       NOT NULL,
+    created_at  DATETIME DEFAULT CURRENT_TIMESTAMP NOT NULL,
+    updated_at  DATETIME DEFAULT CURRENT_TIMESTAMP NOT NULL,
     deleted_at  DATETIME,
-    name        TEXT     NOT NULL,
-    description TEXT     NOT NULL
+    name        TEXT                               NOT NULL,
+    description TEXT                               NOT NULL
 );
 
 CREATE TABLE http_requests
 (
-    id           TEXT     NOT NULL PRIMARY KEY,
-    workspace_id TEXT     NOT NULL REFERENCES workspaces (id) ON DELETE CASCADE,
-    created_at   DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
-    updated_at   DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    id           TEXT                               NOT NULL
+        PRIMARY KEY,
+    model        TEXT     DEFAULT 'http_request'    NOT NULL,
+    workspace_id TEXT                               NOT NULL
+        REFERENCES workspaces
+            ON DELETE CASCADE,
+    created_at   DATETIME DEFAULT CURRENT_TIMESTAMP NOT NULL,
+    updated_at   DATETIME DEFAULT CURRENT_TIMESTAMP NOT NULL,
     deleted_at   DATETIME,
-    name         TEXT     NOT NULL,
-    url          TEXT     NOT NULL,
-    method       TEXT     NOT NULL,
-    headers      TEXT     NOT NULL,
-    body         TEXT
+    name         TEXT                               NOT NULL,
+    url          TEXT                               NOT NULL,
+    method       TEXT                               NOT NULL,
+    headers      TEXT                               NOT NULL,
+    body         TEXT,
+    body_type    TEXT
 );
 
 CREATE TABLE http_responses
 (
-    id            TEXT     NOT NULL PRIMARY KEY,
-    request_id    TEXT     NOT NULL REFERENCES http_requests (id) ON DELETE CASCADE,
-    workspace_id  TEXT     NOT NULL REFERENCES workspaces (id) ON DELETE CASCADE,
-    created_at    DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
-    updated_at    DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    id            TEXT                               NOT NULL
+        PRIMARY KEY,
+    model         TEXT     DEFAULT 'http_response'   NOT NULL,
+    request_id    TEXT                               NOT NULL
+        REFERENCES http_requests
+            ON DELETE CASCADE,
+    workspace_id  TEXT                               NOT NULL
+        REFERENCES workspaces
+            ON DELETE CASCADE,
+    created_at    DATETIME DEFAULT CURRENT_TIMESTAMP NOT NULL,
+    updated_at    DATETIME DEFAULT CURRENT_TIMESTAMP NOT NULL,
     deleted_at    DATETIME,
-    elapsed       INTEGER  NOT NULL,
-    status        INTEGER  NOT NULL,
+    elapsed       INTEGER                            NOT NULL,
+    status        INTEGER                            NOT NULL,
     status_reason TEXT,
-    url           TEXT     NOT NULL,
-    body          TEXT     NOT NULL,
-    headers       TEXT     NOT NULL
+    url           TEXT                               NOT NULL,
+    body          TEXT                               NOT NULL,
+    headers       TEXT                               NOT NULL,
+    error         TEXT
 );

src-tauri/migrations/20230301163450_add-response-error.sql

@@ -1 +0,0 @@
-ALTER TABLE http_responses ADD COLUMN error TEXT NULL;

src-tauri/migrations/20230319042610_sort-priority.sql

@@ -0,0 +1 @@
+ALTER TABLE main.http_requests ADD COLUMN sort_priority REAL NOT NULL DEFAULT 0;

src-tauri/migrations/20230330143214_request-auth.sql

@@ -0,0 +1,2 @@
+ALTER TABLE http_requests ADD COLUMN authentication TEXT NOT NULL DEFAULT '{}';
+ALTER TABLE http_requests ADD COLUMN authentication_type TEXT;

src-tauri/migrations/20230413232435_response-body-blob.sql

@@ -0,0 +1,5 @@
+DELETE FROM main.http_responses;
+ALTER TABLE http_responses DROP COLUMN body;
+ALTER TABLE http_responses ADD COLUMN body BLOB;
+ALTER TABLE http_responses ADD COLUMN body_path TEXT;
+ALTER TABLE http_responses ADD COLUMN content_length INTEGER;

src-tauri/migrations/20231022205109_environments.sql

@@ -0,0 +1,15 @@
+CREATE TABLE environments
+(
+    id          TEXT                               NOT NULL
+        PRIMARY KEY,
+    model       TEXT     DEFAULT 'workspace'       NOT NULL,
+    created_at  DATETIME DEFAULT CURRENT_TIMESTAMP NOT NULL,
+    updated_at  DATETIME DEFAULT CURRENT_TIMESTAMP NOT NULL,
+    deleted_at  DATETIME,
+    workspace_id TEXT                               NOT NULL
+        REFERENCES workspaces
+            ON DELETE CASCADE,
+    name        TEXT                               NOT NULL,
+    data        TEXT                               NOT NULL
+        DEFAULT '{}'
+);

src-tauri/migrations/20231028161007_variables.sql

@@ -0,0 +1,2 @@
+ALTER TABLE environments DROP COLUMN data;
+ALTER TABLE environments ADD COLUMN variables DEFAULT '[]' NOT NULL;

src-tauri/migrations/20231103004111_workspace-variables.sql

@@ -0,0 +1 @@
+ALTER TABLE workspaces ADD COLUMN variables DEFAULT '[]' NOT NULL;

src-tauri/migrations/20231103142807_folders.sql

@@ -0,0 +1,19 @@
+CREATE TABLE folders
+(
+    id            TEXT                               NOT NULL
+        PRIMARY   KEY,
+    model         TEXT     DEFAULT 'folder'          NOT NULL,
+    created_at    DATETIME DEFAULT CURRENT_TIMESTAMP NOT NULL,
+    updated_at    DATETIME DEFAULT CURRENT_TIMESTAMP NOT NULL,
+    deleted_at    DATETIME,
+    workspace_id  TEXT                               NOT NULL
+        REFERENCES workspaces
+            ON DELETE CASCADE,
+    folder_id     TEXT                               NULL
+        REFERENCES folders
+            ON DELETE CASCADE,
+    name          TEXT                               NOT NULL,
+    sort_priority REAL     DEFAULT 0                 NOT NULL
+);
+
+ALTER TABLE http_requests ADD COLUMN folder_id TEXT REFERENCES folders(id) ON DELETE CASCADE;

src-tauri/plugins/hello-world/greet.js

@@ -0,0 +1,4 @@
+export function greet() {
+  // Call Rust-provided fn!
+  sayHello('Plugin');
+}

src-tauri/plugins/hello-world/index.js

@@ -0,0 +1,7 @@
+import { greet } from './greet.js';
+
+export function hello() {
+  greet();
+  console.log('Try JSON parse', JSON.parse(`{ "hello": 123 }`).hello);
+  console.log('Try RegExp', '123'.match(/[\d]+/));
+}

src-tauri/plugins/insomnia-importer/out/index.js

@@ -0,0 +1,156 @@
+function O(e, t) {
+  return (
+    console.log('IMPORTING Environment', e._id, e.name, JSON.stringify(e, null, 2)),
+    {
+      id: e._id,
+      createdAt: new Date(e.created ?? Date.now()).toISOString().replace('Z', ''),
+      updatedAt: new Date(e.updated ?? Date.now()).toISOString().replace('Z', ''),
+      workspaceId: t,
+      model: 'environment',
+      name: e.name,
+      variables: Object.entries(e.data).map(([i, s]) => ({
+        enabled: !0,
+        name: i,
+        value: `${s}`,
+      })),
+    }
+  );
+}
+function g(e) {
+  return d(e) && e._type === 'workspace';
+}
+function y(e) {
+  return d(e) && e._type === 'request_group';
+}
+function _(e) {
+  return d(e) && e._type === 'request';
+}
+function I(e) {
+  return d(e) && e._type === 'environment';
+}
+function d(e) {
+  return Object.prototype.toString.call(e) === '[object Object]';
+}
+function h(e) {
+  return Object.prototype.toString.call(e) === '[object String]';
+}
+function N(e) {
+  return Object.entries(e).map(([t, i]) => ({
+    enabled: !0,
+    name: t,
+    value: `${i}`,
+  }));
+}
+function c(e) {
+  return h(e) ? e.replaceAll(/{{\s*(_\.)?([^}]+)\s*}}/g, '${[$2]}') : e;
+}
+function D(e, t, i = 0) {
+  var a, u;
+  console.log('IMPORTING REQUEST', e._id, e.name, JSON.stringify(e, null, 2));
+  let s = null,
+    n = null;
+  ((a = e.body) == null ? void 0 : a.mimeType) === 'application/graphql'
+    ? ((s = 'graphql'), (n = c(e.body.text)))
+    : ((u = e.body) == null ? void 0 : u.mimeType) === 'application/json' &&
+      ((s = 'application/json'), (n = c(e.body.text)));
+  let p = null,
+    o = {};
+  return (
+    e.authentication.type === 'bearer'
+      ? ((p = 'bearer'),
+        (o = {
+          token: c(e.authentication.token),
+        }))
+      : e.authentication.type === 'basic' &&
+        ((p = 'basic'),
+        (o = {
+          username: c(e.authentication.username),
+          password: c(e.authentication.password),
+        })),
+    {
+      id: e._id,
+      createdAt: new Date(e.created ?? Date.now()).toISOString().replace('Z', ''),
+      updatedAt: new Date(e.updated ?? Date.now()).toISOString().replace('Z', ''),
+      workspaceId: t,
+      folderId: e.parentId === t ? null : e.parentId,
+      model: 'http_request',
+      sortPriority: i,
+      name: e.name,
+      url: c(e.url),
+      body: n,
+      bodyType: s,
+      authentication: o,
+      authenticationType: p,
+      method: e.method,
+      headers: (e.headers ?? []).map(({ name: m, value: r, disabled: f }) => ({
+        enabled: !f,
+        name: m,
+        value: r,
+      })),
+    }
+  );
+}
+function w(e, t) {
+  return (
+    console.log('IMPORTING Workspace', e._id, e.name, JSON.stringify(e, null, 2)),
+    {
+      id: e._id,
+      createdAt: new Date(e.created ?? Date.now()).toISOString().replace('Z', ''),
+      updatedAt: new Date(e.updated ?? Date.now()).toISOString().replace('Z', ''),
+      model: 'workspace',
+      name: e.name,
+      variables: t,
+    }
+  );
+}
+function b(e, t) {
+  return (
+    console.log('IMPORTING FOLDER', e._id, e.name, JSON.stringify(e, null, 2)),
+    {
+      id: e._id,
+      createdAt: new Date(e.created ?? Date.now()).toISOString().replace('Z', ''),
+      updatedAt: new Date(e.updated ?? Date.now()).toISOString().replace('Z', ''),
+      folderId: e.parentId === t ? null : e.parentId,
+      workspaceId: t,
+      model: 'folder',
+      name: e.name,
+    }
+  );
+}
+function T(e) {
+  const t = JSON.parse(e);
+  if (!d(t)) return;
+  const { _type: i, __export_format: s } = t;
+  if (i !== 'export' || s !== 4 || !Array.isArray(t.resources)) return;
+  const n = {
+      workspaces: [],
+      requests: [],
+      environments: [],
+      folders: [],
+    },
+    p = t.resources.filter(g);
+  for (const o of p) {
+    console.log('IMPORTING WORKSPACE', o.name);
+    const a = t.resources.find((r) => I(r) && r.parentId === o._id);
+    console.log('FOUND BASE ENV', a.name),
+      n.workspaces.push(w(o, a ? N(a.data) : [])),
+      console.log('IMPORTING ENVIRONMENTS', a.name);
+    const u = t.resources.filter((r) => I(r) && r.parentId === (a == null ? void 0 : a._id));
+    console.log('FOUND', u.length, 'ENVIRONMENTS'),
+      n.environments.push(...u.map((r) => O(r, o._id)));
+    const m = (r) => {
+      const f = t.resources.filter((l) => l.parentId === r);
+      let S = 0;
+      for (const l of f)
+        y(l) ? (n.folders.push(b(l, o._id)), m(l._id)) : _(l) && n.requests.push(D(l, o._id, S++));
+    };
+    m(o._id);
+  }
+  return (
+    (n.requests = n.requests.filter(Boolean)),
+    (n.environments = n.environments.filter(Boolean)),
+    (n.workspaces = n.workspaces.filter(Boolean)),
+    n
+  );
+}
+export { T as pluginHookImport };

src-tauri/plugins/insomnia-importer/src/helpers/types.js

@@ -0,0 +1,23 @@
+export function isWorkspace(obj) {
+  return isJSObject(obj) && obj._type === 'workspace';
+}
+
+export function isRequestGroup(obj) {
+  return isJSObject(obj) && obj._type === 'request_group';
+}
+
+export function isRequest(obj) {
+  return isJSObject(obj) && obj._type === 'request';
+}
+
+export function isEnvironment(obj) {
+  return isJSObject(obj) && obj._type === 'environment';
+}
+
+export function isJSObject(obj) {
+  return Object.prototype.toString.call(obj) === '[object Object]';
+}
+
+export function isJSString(obj) {
+  return Object.prototype.toString.call(obj) === '[object String]';
+}

src-tauri/plugins/insomnia-importer/src/helpers/variables.js

@@ -0,0 +1,18 @@
+import { isJSString } from './types.js';
+
+export function parseVariables(data) {
+  return Object.entries(data).map(([name, value]) => ({
+    enabled: true,
+    name,
+    value: `${value}`,
+  }));
+}
+
+/**
+ * Convert Insomnia syntax to Yaak syntax
+ * @param {string} variable - Text to convert
+ */
+export function convertSyntax(variable) {
+  if (!isJSString(variable)) return variable;
+  return variable.replaceAll(/{{\s*(_\.)?([^}]+)\s*}}/g, '${[$2]}');
+}

src-tauri/plugins/insomnia-importer/src/importers/environment.js

@@ -0,0 +1,21 @@
+/**
+ * Import an Insomnia environment object.
+ * @param {Object} e - The environment object to import.
+ * @param workspaceId - Workspace to import into.
+ */
+export function importEnvironment(e, workspaceId) {
+  console.log('IMPORTING Environment', e._id, e.name, JSON.stringify(e, null, 2));
+  return {
+    id: e._id,
+    createdAt: new Date(e.created ?? Date.now()).toISOString().replace('Z', ''),
+    updatedAt: new Date(e.updated ?? Date.now()).toISOString().replace('Z', ''),
+    workspaceId,
+    model: 'environment',
+    name: e.name,
+    variables: Object.entries(e.data).map(([name, value]) => ({
+      enabled: true,
+      name,
+      value: `${value}`,
+    })),
+  };
+}

src-tauri/plugins/insomnia-importer/src/importers/folder.js

@@ -0,0 +1,17 @@
+/**
+ * Import an Insomnia folder object.
+ * @param {Object} f - The environment object to import.
+ * @param workspaceId - Workspace to import into.
+ */
+export function importFolder(f, workspaceId) {
+  console.log('IMPORTING FOLDER', f._id, f.name, JSON.stringify(f, null, 2));
+  return {
+    id: f._id,
+    createdAt: new Date(f.created ?? Date.now()).toISOString().replace('Z', ''),
+    updatedAt: new Date(f.updated ?? Date.now()).toISOString().replace('Z', ''),
+    folderId: f.parentId === workspaceId ? null : f.parentId,
+    workspaceId,
+    model: 'folder',
+    name: f.name,
+  };
+}

src-tauri/plugins/insomnia-importer/src/importers/request.js

@@ -0,0 +1,58 @@
+import { convertSyntax } from '../helpers/variables.js';
+
+/**
+ * Import an Insomnia request object.
+ * @param {Object} r - The request object to import.
+ * @param workspaceId - The workspace ID to use for the request.
+ * @param {number} sortPriority - The sort priority to use for the request.
+ */
+export function importRequest(r, workspaceId, sortPriority = 0) {
+  console.log('IMPORTING REQUEST', r._id, r.name, JSON.stringify(r, null, 2));
+
+  let bodyType = null;
+  let body = null;
+  if (r.body?.mimeType === 'application/graphql') {
+    bodyType = 'graphql';
+    body = convertSyntax(r.body.text);
+  } else if (r.body?.mimeType === 'application/json') {
+    bodyType = 'application/json';
+    body = convertSyntax(r.body.text);
+  }
+
+  let authenticationType = null;
+  let authentication = {};
+  if (r.authentication.type === 'bearer') {
+    authenticationType = 'bearer';
+    authentication = {
+      token: convertSyntax(r.authentication.token),
+    };
+  } else if (r.authentication.type === 'basic') {
+    authenticationType = 'basic';
+    authentication = {
+      username: convertSyntax(r.authentication.username),
+      password: convertSyntax(r.authentication.password),
+    };
+  }
+
+  return {
+    id: r._id,
+    createdAt: new Date(r.created ?? Date.now()).toISOString().replace('Z', ''),
+    updatedAt: new Date(r.updated ?? Date.now()).toISOString().replace('Z', ''),
+    workspaceId,
+    folderId: r.parentId === workspaceId ? null : r.parentId,
+    model: 'http_request',
+    sortPriority,
+    name: r.name,
+    url: convertSyntax(r.url),
+    body,
+    bodyType,
+    authentication,
+    authenticationType,
+    method: r.method,
+    headers: (r.headers ?? []).map(({ name, value, disabled }) => ({
+      enabled: !disabled,
+      name,
+      value,
+    })),
+  };
+}

src-tauri/plugins/insomnia-importer/src/importers/workspace.js

@@ -0,0 +1,15 @@
+/**
+ * Import an Insomnia workspace object.
+ * @param {Object} w - The workspace object to import.
+ */
+export function importWorkspace(w, variables) {
+  console.log('IMPORTING Workspace', w._id, w.name, JSON.stringify(w, null, 2));
+  return {
+    id: w._id,
+    createdAt: new Date(w.created ?? Date.now()).toISOString().replace('Z', ''),
+    updatedAt: new Date(w.updated ?? Date.now()).toISOString().replace('Z', ''),
+    model: 'workspace',
+    name: w.name,
+    variables,
+  };
+}

src-tauri/plugins/insomnia-importer/src/index.js

@@ -0,0 +1,78 @@
+import { importEnvironment } from './importers/environment.js';
+import { importRequest } from './importers/request.js';
+import { importWorkspace } from './importers/workspace.js';
+import {
+  isEnvironment,
+  isJSObject,
+  isRequest,
+  isRequestGroup,
+  isWorkspace,
+} from './helpers/types.js';
+import { parseVariables } from './helpers/variables.js';
+import { importFolder } from './importers/folder.js';
+
+export function pluginHookImport(contents) {
+  const parsed = JSON.parse(contents);
+  if (!isJSObject(parsed)) {
+    return;
+  }
+
+  const { _type, __export_format } = parsed;
+  if (_type !== 'export' || __export_format !== 4 || !Array.isArray(parsed.resources)) {
+    return;
+  }
+
+  const resources = {
+    workspaces: [],
+    requests: [],
+    environments: [],
+    folders: [],
+  };
+
+  // Import workspaces
+  const workspacesToImport = parsed.resources.filter(isWorkspace);
+  for (const workspaceToImport of workspacesToImport) {
+    console.log('IMPORTING WORKSPACE', workspaceToImport.name);
+    const baseEnvironment = parsed.resources.find(
+      (r) => isEnvironment(r) && r.parentId === workspaceToImport._id,
+    );
+    console.log('FOUND BASE ENV', baseEnvironment.name);
+    resources.workspaces.push(
+      importWorkspace(
+        workspaceToImport,
+        baseEnvironment ? parseVariables(baseEnvironment.data) : [],
+      ),
+    );
+    console.log('IMPORTING ENVIRONMENTS', baseEnvironment.name);
+    const environmentsToImport = parsed.resources.filter(
+      (r) => isEnvironment(r) && r.parentId === baseEnvironment?._id,
+    );
+    console.log('FOUND', environmentsToImport.length, 'ENVIRONMENTS');
+    resources.environments.push(
+      ...environmentsToImport.map((r) => importEnvironment(r, workspaceToImport._id)),
+    );
+
+    const nextFolder = (parentId) => {
+      const children = parsed.resources.filter((r) => r.parentId === parentId);
+      let sortPriority = 0;
+      for (const child of children) {
+        if (isRequestGroup(child)) {
+          resources.folders.push(importFolder(child, workspaceToImport._id));
+          nextFolder(child._id);
+        } else if (isRequest(child)) {
+          resources.requests.push(importRequest(child, workspaceToImport._id, sortPriority++));
+        }
+      }
+    };
+
+    // Import folders
+    nextFolder(workspaceToImport._id);
+  }
+
+  // Filter out any `null` values
+  resources.requests = resources.requests.filter(Boolean);
+  resources.environments = resources.environments.filter(Boolean);
+  resources.workspaces = resources.workspaces.filter(Boolean);
+
+  return resources;
+}

src-tauri/plugins/insomnia-importer/vite.config.js

@@ -0,0 +1,13 @@
+import { resolve } from 'path';
+import { defineConfig } from 'vite';
+
+export default defineConfig({
+  build: {
+    lib: {
+      entry: resolve(__dirname, 'src/index.js'),
+      fileName: 'index',
+      formats: ['es'],
+    },
+    outDir: resolve(__dirname, 'out'),
+  },
+});

src-tauri/plugins/plugin.ts

@@ -1 +0,0 @@
-Deno.core.opAsync('op_hello', 'Deno');

src-tauri/src/analytics.rs

@@ -0,0 +1,118 @@
+use sqlx::types::JsonValue;
+use tauri::{async_runtime, AppHandle, Manager};
+
+use crate::is_dev;
+
+pub enum AnalyticsResource {
+    App,
+    // Workspace,
+    // Environment,
+    // Folder,
+    // HttpRequest,
+    // HttpResponse,
+}
+
+pub enum AnalyticsAction {
+    Launch,
+    // Create,
+    // Update,
+    // Upsert,
+    // Delete,
+    // Send,
+    // Duplicate,
+}
+
+fn resource_name(resource: AnalyticsResource) -> &'static str {
+    match resource {
+        AnalyticsResource::App => "app",
+        // AnalyticsResource::Workspace => "workspace",
+        // AnalyticsResource::Environment => "environment",
+        // AnalyticsResource::Folder => "folder",
+        // AnalyticsResource::HttpRequest => "http_request",
+        // AnalyticsResource::HttpResponse => "http_response",
+    }
+}
+
+fn action_name(action: AnalyticsAction) -> &'static str {
+    match action {
+        AnalyticsAction::Launch => "launch",
+        // AnalyticsAction::Create => "create",
+        // AnalyticsAction::Update => "update",
+        // AnalyticsAction::Upsert => "upsert",
+        // AnalyticsAction::Delete => "delete",
+        // AnalyticsAction::Send => "send",
+        // AnalyticsAction::Duplicate => "duplicate",
+    }
+}
+
+pub fn track_event(
+    app_handle: &AppHandle,
+    resource: AnalyticsResource,
+    action: AnalyticsAction,
+    attributes: Option<JsonValue>,
+) {
+    async_runtime::block_on(async move {
+        let event = format!("{}.{}", resource_name(resource), action_name(action));
+        let attributes_json = attributes.unwrap_or("{}".to_string().into()).to_string();
+        let info = app_handle.package_info();
+        let params = vec![
+            ("e", event.clone()),
+            ("a", attributes_json.clone()),
+            ("id", "site_zOK0d7jeBy2TLxFCnZ".to_string()),
+            ("v", info.version.clone().to_string()),
+            ("os", get_os().to_string()),
+            ("xy", get_window_size(app_handle)),
+        ];
+        let url = format!("https://t.yaak.app/t/e");
+        let req = reqwest::Client::builder()
+            .build()
+            .unwrap()
+            .get(&url)
+            .query(&params);
+
+        if is_dev() {
+            println!("Ignore dev analytics event: {} {:?}", event, params);
+        } else {
+            if let Err(e) = req.send().await {
+                println!("Error sending analytics event: {}", e);
+            } else {
+                println!("Sent analytics event: {}", event);
+            }
+        }
+    });
+}
+
+fn get_os() -> &'static str {
+    if cfg!(target_os = "windows") {
+        "windows"
+    } else if cfg!(target_os = "macos") {
+        "macos"
+    } else if cfg!(target_os = "linux") {
+        "linux"
+    } else {
+        "unknown"
+    }
+}
+
+fn get_window_size(app_handle: &AppHandle) -> String {
+    let window = match app_handle.windows().into_values().next() {
+        Some(w) => w,
+        None => return "unknown".to_string(),
+    };
+
+    let current_monitor = match window.current_monitor() {
+        Ok(Some(m)) => m,
+        _ => return "unknown".to_string(),
+    };
+
+    let scale_factor = current_monitor.scale_factor();
+    let size = current_monitor.size();
+    let width: f64 = size.width as f64 / scale_factor;
+    let height: f64 = size.height as f64 / scale_factor;
+
+    format!(
+        "{}x{}",
+        (width / 100.0).round() * 100.0,
+        (height / 100.0).round() * 100.0
+    )
+}

src-tauri/src/models.rs

@@ -1,72 +1,193 @@
+use std::collections::HashMap;
+use std::fs;
+
 use rand::distributions::{Alphanumeric, DistString};
 use serde::{Deserialize, Serialize};
 use sqlx::types::chrono::NaiveDateTime;
-use sqlx::types::Json;
+use sqlx::types::{Json, JsonValue};
 use sqlx::{Pool, Sqlite};
 
-#[derive(sqlx::FromRow, Debug, Clone, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
+#[derive(sqlx::FromRow, Debug, Clone, Serialize, Deserialize, Default)]
+#[serde(default, rename_all = "camelCase")]
 pub struct Workspace {
     pub id: String,
+    pub model: String,
     pub created_at: NaiveDateTime,
     pub updated_at: NaiveDateTime,
-    pub deleted_at: Option<NaiveDateTime>,
     pub name: String,
     pub description: String,
+    pub variables: Json<Vec<EnvironmentVariable>>,
 }
 
-#[derive(Debug, Clone, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct HttpRequestHeader {
+#[derive(sqlx::FromRow, Debug, Clone, Serialize, Deserialize, Default)]
+#[serde(default, rename_all = "camelCase")]
+pub struct Environment {
+    pub id: String,
+    pub workspace_id: String,
+    pub model: String,
+    pub created_at: NaiveDateTime,
+    pub updated_at: NaiveDateTime,
+    pub name: String,
+    pub variables: Json<Vec<EnvironmentVariable>>,
+}
+
+fn default_enabled() -> bool {
+    true
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize, Default)]
+#[serde(default, rename_all = "camelCase")]
+pub struct EnvironmentVariable {
+    #[serde(default = "default_enabled")]
+    pub enabled: bool,
     pub name: String,
     pub value: String,
 }
 
-#[derive(sqlx::FromRow, Debug, Clone, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
+#[derive(Debug, Clone, Serialize, Deserialize, Default)]
+#[serde(default, rename_all = "camelCase")]
+pub struct HttpRequestHeader {
+    #[serde(default = "default_enabled")]
+    pub enabled: bool,
+    pub name: String,
+    pub value: String,
+}
+
+fn default_http_request_method() -> String {
+    "GET".to_string()
+}
+
+#[derive(sqlx::FromRow, Debug, Clone, Serialize, Deserialize, Default)]
+#[serde(default, rename_all = "camelCase")]
 pub struct HttpRequest {
-    pub id: String,
     pub created_at: NaiveDateTime,
     pub updated_at: NaiveDateTime,
-    pub deleted_at: Option<NaiveDateTime>,
+    pub id: String,
     pub workspace_id: String,
+    pub folder_id: Option<String>,
+    pub model: String,
+    pub sort_priority: f64,
     pub name: String,
     pub url: String,
+    #[serde(default = "default_http_request_method")]
     pub method: String,
     pub body: Option<String>,
+    pub body_type: Option<String>,
+    pub authentication: Json<HashMap<String, JsonValue>>,
+    pub authentication_type: Option<String>,
     pub headers: Json<Vec<HttpRequestHeader>>,
 }
 
-#[derive(Debug, Clone, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
+#[derive(sqlx::FromRow, Debug, Clone, Serialize, Deserialize, Default)]
+#[serde(default, rename_all = "camelCase")]
+pub struct Folder {
+    pub created_at: NaiveDateTime,
+    pub updated_at: NaiveDateTime,
+    pub id: String,
+    pub workspace_id: String,
+    pub folder_id: Option<String>,
+    pub model: String,
+    pub name: String,
+    pub sort_priority: f64,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize, Default)]
+#[serde(default, rename_all = "camelCase")]
 pub struct HttpResponseHeader {
     pub name: String,
     pub value: String,
 }
 
-#[derive(sqlx::FromRow, Debug, Clone, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
+#[derive(sqlx::FromRow, Debug, Clone, Serialize, Deserialize, Default)]
+#[serde(default, rename_all = "camelCase")]
 pub struct HttpResponse {
     pub id: String,
+    pub model: String,
     pub workspace_id: String,
     pub request_id: String,
     pub created_at: NaiveDateTime,
     pub updated_at: NaiveDateTime,
-    pub deleted_at: Option<NaiveDateTime>,
     pub error: Option<String>,
     pub url: String,
+    pub content_length: Option<i64>,
     pub elapsed: i64,
     pub status: i64,
     pub status_reason: Option<String>,
-    pub body: String,
+    pub body: Option<Vec<u8>>,
+    pub body_path: Option<String>,
     pub headers: Json<Vec<HttpResponseHeader>>,
 }
 
+impl HttpResponse {
+    pub(crate) fn new() -> Self {
+        Self {
+            model: "http_response".to_string(),
+            ..Default::default()
+        }
+    }
+}
+
+#[derive(sqlx::FromRow, Debug, Clone, Serialize, Deserialize, Default)]
+#[serde(default, rename_all = "camelCase")]
+pub struct KeyValue {
+    pub model: String,
+    pub created_at: NaiveDateTime,
+    pub updated_at: NaiveDateTime,
+    pub namespace: String,
+    pub key: String,
+    pub value: String,
+}
+
+pub async fn set_key_value(
+    namespace: &str,
+    key: &str,
+    value: &str,
+    pool: &Pool<Sqlite>,
+) -> (KeyValue, bool) {
+    let existing = get_key_value(namespace, key, pool).await;
+    sqlx::query!(
+        r#"
+            INSERT INTO key_values (namespace, key, value)
+            VALUES (?, ?, ?) ON CONFLICT DO UPDATE SET
+               updated_at = CURRENT_TIMESTAMP,
+               value = excluded.value
+        "#,
+        namespace,
+        key,
+        value,
+    )
+    .execute(pool)
+    .await
+    .expect("Failed to insert key value");
+
+    let kv = get_key_value(namespace, key, pool)
+        .await
+        .expect("Failed to get key value");
+    return (kv, existing.is_none());
+}
+
+pub async fn get_key_value(namespace: &str, key: &str, pool: &Pool<Sqlite>) -> Option<KeyValue> {
+    sqlx::query_as!(
+        KeyValue,
+        r#"
+            SELECT model, created_at, updated_at, namespace, key, value
+            FROM key_values
+            WHERE namespace = ? AND key = ?
+        "#,
+        namespace,
+        key,
+    )
+    .fetch_one(pool)
+    .await
+    .ok()
+}
+
 pub async fn find_workspaces(pool: &Pool<Sqlite>) -> Result<Vec<Workspace>, sqlx::Error> {
     sqlx::query_as!(
         Workspace,
         r#"
-            SELECT id, created_at, updated_at, deleted_at, name, description
+            SELECT id, model, created_at, updated_at, name, description,
+                variables AS "variables!: sqlx::types::Json<Vec<EnvironmentVariable>>"
             FROM workspaces
         "#,
     )
@@ -78,8 +199,114 @@ pub async fn get_workspace(id: &str, pool: &Pool<Sqlite>) -> Result<Workspace, s
     sqlx::query_as!(
         Workspace,
         r#"
-            SELECT id, created_at, updated_at, deleted_at, name, description
-            FROM workspaces
+            SELECT id, model, created_at, updated_at, name, description,
+                variables AS "variables!: sqlx::types::Json<Vec<EnvironmentVariable>>"
+            FROM workspaces WHERE id = ?
+        "#,
+        id,
+    )
+    .fetch_one(pool)
+    .await
+}
+
+pub async fn delete_workspace(id: &str, pool: &Pool<Sqlite>) -> Result<Workspace, sqlx::Error> {
+    let workspace = get_workspace(id, pool).await?;
+    let _ = sqlx::query!(
+        r#"
+            DELETE FROM workspaces
+            WHERE id = ?
+        "#,
+        id,
+    )
+    .execute(pool)
+    .await;
+
+    for r in find_responses_by_workspace_id(id, pool).await? {
+        delete_response(&r.id, pool).await?;
+    }
+
+    Ok(workspace)
+}
+
+pub async fn find_environments(
+    workspace_id: &str,
+    pool: &Pool<Sqlite>,
+) -> Result<Vec<Environment>, sqlx::Error> {
+    sqlx::query_as!(
+        Environment,
+        r#"
+            SELECT id, workspace_id, model, created_at, updated_at, name,
+                variables AS "variables!: sqlx::types::Json<Vec<EnvironmentVariable>>"
+            FROM environments
+            WHERE workspace_id = ?
+        "#,
+        workspace_id,
+    )
+    .fetch_all(pool)
+    .await
+}
+
+pub async fn delete_environment(id: &str, pool: &Pool<Sqlite>) -> Result<Environment, sqlx::Error> {
+    let env = get_environment(id, pool).await?;
+    let _ = sqlx::query!(
+        r#"
+            DELETE FROM environments
+            WHERE id = ?
+        "#,
+        id,
+    )
+    .execute(pool)
+    .await;
+
+    Ok(env)
+}
+
+pub async fn upsert_environment(
+    pool: &Pool<Sqlite>,
+    environment: Environment,
+) -> Result<Environment, sqlx::Error> {
+    let id = match environment.id.as_str() {
+        "" => generate_id(Some("ev")),
+        _ => environment.id.to_string(),
+    };
+    let trimmed_name = environment.name.trim();
+    sqlx::query!(
+        r#"
+            INSERT INTO environments (
+                id,
+                workspace_id,
+                name,
+                variables
+            )
+            VALUES (?, ?, ?, ?)
+            ON CONFLICT (id) DO UPDATE SET
+               updated_at = CURRENT_TIMESTAMP,
+               name = excluded.name,
+               variables = excluded.variables
+        "#,
+        id,
+        environment.workspace_id,
+        trimmed_name,
+        environment.variables,
+    )
+    .execute(pool)
+    .await?;
+    get_environment(&id, pool).await
+}
+
+pub async fn get_environment(id: &str, pool: &Pool<Sqlite>) -> Result<Environment, sqlx::Error> {
+    sqlx::query_as!(
+        Environment,
+        r#"
+            SELECT
+                id,
+                model,
+                workspace_id,
+                created_at,
+                updated_at,
+                name,
+                variables AS "variables!: sqlx::types::Json<Vec<EnvironmentVariable>>"
+            FROM environments
             WHERE id = ?
         "#,
         id,
@@ -88,71 +315,168 @@ pub async fn get_workspace(id: &str, pool: &Pool<Sqlite>) -> Result<Workspace, s
     .await
 }
 
-pub async fn create_workspace(
-    name: &str,
-    description: &str,
-    pool: &Pool<Sqlite>,
-) -> Result<Workspace, sqlx::Error> {
-    let id = generate_id("wk");
-    sqlx::query!(
+pub async fn get_folder(id: &str, pool: &Pool<Sqlite>) -> Result<Folder, sqlx::Error> {
+    sqlx::query_as!(
+        Folder,
         r#"
-            INSERT INTO workspaces (id, name, description)
-            VALUES (?, ?, ?)
+            SELECT
+                id,
+                model,
+                workspace_id,
+                created_at,
+                updated_at,
+                folder_id,
+                name,
+                sort_priority
+            FROM folders
+            WHERE id = ?
         "#,
         id,
-        name,
-        description,
     )
-    .execute(pool)
+    .fetch_one(pool)
     .await
-    .expect("Failed to insert new workspace");
-
-    get_workspace(&id, pool).await
 }
 
-pub async fn upsert_request(
-    id: Option<&str>,
+pub async fn find_folders(
     workspace_id: &str,
-    name: &str,
-    method: &str,
-    body: Option<&str>,
-    url: &str,
-    headers: Vec<HttpRequestHeader>,
     pool: &Pool<Sqlite>,
-) -> Result<HttpRequest, sqlx::Error> {
-    let generated_id;
-    let id = match id {
-        Some(v) => v,
-        None => {
-            generated_id = generate_id("rq");
-            generated_id.as_str()
-        }
+) -> Result<Vec<Folder>, sqlx::Error> {
+    sqlx::query_as!(
+        Folder,
+        r#"
+            SELECT
+                id,
+                model,
+                workspace_id,
+                created_at,
+                updated_at,
+                folder_id,
+                name,
+                sort_priority
+            FROM folders
+            WHERE workspace_id = ?
+        "#,
+        workspace_id,
+    )
+    .fetch_all(pool)
+    .await
+}
+
+pub async fn delete_folder(id: &str, pool: &Pool<Sqlite>) -> Result<Folder, sqlx::Error> {
+    let env = get_folder(id, pool).await?;
+    let _ = sqlx::query!(
+        r#"
+            DELETE FROM folders
+            WHERE id = ?
+        "#,
+        id,
+    )
+    .execute(pool)
+    .await;
+
+    Ok(env)
+}
+
+pub async fn upsert_folder(pool: &Pool<Sqlite>, r: Folder) -> Result<Folder, sqlx::Error> {
+    let id = match r.id.as_str() {
+        "" => generate_id(Some("fl")),
+        _ => r.id.to_string(),
     };
-    let headers_json = Json(headers);
+    let trimmed_name = r.name.trim();
+
     sqlx::query!(
         r#"
-            INSERT INTO http_requests (id, workspace_id, name, url, method, body, headers, updated_at)
-            VALUES (?, ?, ?, ?, ?, ?, ?, CURRENT_TIMESTAMP)
+            INSERT INTO folders (
+                id,
+                workspace_id,
+                folder_id,
+                name,
+                sort_priority
+            )
+            VALUES (?, ?, ?, ?, ?)
             ON CONFLICT (id) DO UPDATE SET
                updated_at = CURRENT_TIMESTAMP,
                name = excluded.name,
+               folder_id = excluded.folder_id,
+               sort_priority = excluded.sort_priority
+        "#,
+        id,
+        r.workspace_id,
+        r.folder_id,
+        trimmed_name,
+        r.sort_priority,
+    )
+    .execute(pool)
+    .await?;
+
+    get_folder(&id, pool).await
+}
+
+pub async fn duplicate_request(id: &str, pool: &Pool<Sqlite>) -> Result<HttpRequest, sqlx::Error> {
+    let mut request = get_request(id, pool).await?.clone();
+    request.id = "".to_string();
+    upsert_request(pool, request).await
+}
+
+pub async fn upsert_request(
+    pool: &Pool<Sqlite>,
+    r: HttpRequest,
+) -> Result<HttpRequest, sqlx::Error> {
+    let id = match r.id.as_str() {
+        "" => generate_id(Some("rq")),
+        _ => r.id.to_string(),
+    };
+    let headers_json = Json(r.headers);
+    let auth_json = Json(r.authentication);
+    let trimmed_name = r.name.trim();
+
+    sqlx::query!(
+        r#"
+            INSERT INTO http_requests (
+                id,
+                workspace_id,
+                folder_id,
+                name,
+                url,
+                method,
+                body,
+                body_type,
+                authentication,
+                authentication_type,
+                headers,
+                sort_priority
+            )
+            VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+            ON CONFLICT (id) DO UPDATE SET
+               updated_at = CURRENT_TIMESTAMP,
+               name = excluded.name,
+               folder_id = excluded.folder_id,
                method = excluded.method,
                headers = excluded.headers,
                body = excluded.body,
-               url = excluded.url
+               body_type = excluded.body_type,
+               authentication = excluded.authentication,
+               authentication_type = excluded.authentication_type,
+               url = excluded.url,
+               sort_priority = excluded.sort_priority
         "#,
         id,
-        workspace_id,
-        name,
-        url,
-        method,
-        body,
+        r.workspace_id,
+        r.folder_id,
+        trimmed_name,
+        r.url,
+        r.method,
+        r.body,
+        r.body_type,
+        auth_json,
+        r.authentication_type,
         headers_json,
+        r.sort_priority,
     )
     .execute(pool)
-    .await
-    .expect("Failed to insert new request");
-    get_request(id, pool).await
+    .await?;
+
+    get_request(&id, pool).await
 }
 
 pub async fn find_requests(
@@ -162,7 +486,21 @@ pub async fn find_requests(
     sqlx::query_as!(
         HttpRequest,
         r#"
-            SELECT id, workspace_id, created_at, updated_at, deleted_at, name, url, method, body,
+            SELECT
+                id,
+                model,
+                workspace_id,
+                folder_id,
+                created_at,
+                updated_at,
+                name,
+                url,
+                method,
+                body,
+                body_type,
+                authentication AS "authentication!: Json<HashMap<String, JsonValue>>",
+                authentication_type,
+                sort_priority,
                 headers AS "headers!: sqlx::types::Json<Vec<HttpRequestHeader>>"
             FROM http_requests
             WHERE workspace_id = ?
@@ -177,11 +515,24 @@ pub async fn get_request(id: &str, pool: &Pool<Sqlite>) -> Result<HttpRequest, s
     sqlx::query_as!(
         HttpRequest,
         r#"
-            SELECT id, workspace_id, created_at, updated_at, deleted_at, name, url, method, body,
+            SELECT
+                id,
+                model,
+                workspace_id,
+                folder_id,
+                created_at,
+                updated_at,
+                name,
+                url,
+                method,
+                body,
+                body_type,
+                authentication AS "authentication!: Json<HashMap<String, JsonValue>>",
+                authentication_type,
+                sort_priority,
                 headers AS "headers!: sqlx::types::Json<Vec<HttpRequestHeader>>"
             FROM http_requests
             WHERE id = ?
-            ORDER BY created_at DESC
         "#,
         id,
     )
@@ -190,9 +541,11 @@ pub async fn get_request(id: &str, pool: &Pool<Sqlite>) -> Result<HttpRequest, s
 }
 
 pub async fn delete_request(id: &str, pool: &Pool<Sqlite>) -> Result<HttpRequest, sqlx::Error> {
-    let req = get_request(id, pool)
-        .await
-        .expect("Failed to get request to delete");
+    let req = get_request(id, pool).await?;
+
+    // DB deletes will cascade but this will delete the files
+    delete_all_responses(id, pool).await?;
+
     let _ = sqlx::query!(
         r#"
             DELETE FROM http_requests
@@ -212,19 +565,31 @@ pub async fn create_response(
     url: &str,
     status: i64,
     status_reason: Option<&str>,
-    body: &str,
+    content_length: Option<i64>,
+    body: Option<Vec<u8>>,
+    body_path: Option<&str>,
     headers: Vec<HttpResponseHeader>,
     pool: &Pool<Sqlite>,
 ) -> Result<HttpResponse, sqlx::Error> {
-    let req = get_request(request_id, pool)
-        .await
-        .expect("Failed to get request");
-    let id = generate_id("rp");
+    let req = get_request(request_id, pool).await?;
+    let id = generate_id(Some("rp"));
     let headers_json = Json(headers);
     sqlx::query!(
         r#"
-            INSERT INTO http_responses (id, request_id, workspace_id, elapsed, url, status, status_reason, body, headers)
-            VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?);
+            INSERT INTO http_responses (
+                id,
+                request_id,
+                workspace_id,
+                elapsed,
+                url,
+                status,
+                status_reason,
+                content_length,
+                body,
+                body_path,
+                headers
+            )
+            VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?);
         "#,
         id,
         request_id,
@@ -233,47 +598,112 @@ pub async fn create_response(
         url,
         status,
         status_reason,
+        content_length,
         body,
+        body_path,
         headers_json,
     )
     .execute(pool)
-    .await
-    .expect("Failed to insert new response");
+    .await?;
 
     get_response(&id, pool).await
 }
 
-pub async fn update_response(
-    response: HttpResponse,
-    pool: &Pool<Sqlite>,
-) -> Result<HttpResponse, sqlx::Error> {
-    let headers_json = Json(response.headers);
+pub async fn cancel_pending_responses(pool: &Pool<Sqlite>) -> Result<(), sqlx::Error> {
     sqlx::query!(
         r#"
-            UPDATE http_responses SET (elapsed, url, status, status_reason, body, error, headers, updated_at) =
-            (?, ?, ?, ?, ?, ?, ?, CURRENT_TIMESTAMP) WHERE id = ?;
+            UPDATE http_responses
+            SET (elapsed, status_reason) = (-1, 'Cancelled')
+            WHERE elapsed = 0;
+        "#,
+    )
+    .execute(pool)
+    .await?;
+    Ok(())
+}
+
+pub async fn update_response_if_id(
+    response: &HttpResponse,
+    pool: &Pool<Sqlite>,
+) -> Result<HttpResponse, sqlx::Error> {
+    if response.id == "" {
+        return Ok(response.clone());
+    }
+    return update_response(response, pool).await;
+}
+
+pub async fn upsert_workspace(
+    pool: &Pool<Sqlite>,
+    workspace: Workspace,
+) -> Result<Workspace, sqlx::Error> {
+    let id = match workspace.id.as_str() {
+        "" => generate_id(Some("wk")),
+        _ => workspace.id.to_string(),
+    };
+    let trimmed_name = workspace.name.trim();
+    sqlx::query!(
+        r#"
+            INSERT INTO workspaces (id, name, description, variables)
+            VALUES (?, ?, ?, ?)
+            ON CONFLICT (id) DO UPDATE SET
+               updated_at = CURRENT_TIMESTAMP,
+               name = excluded.name,
+               description = excluded.description,
+               variables = excluded.variables
+        "#,
+        id,
+        trimmed_name,
+        workspace.description,
+        workspace.variables,
+    )
+    .execute(pool)
+    .await?;
+
+    get_workspace(&id, pool).await
+}
+
+pub async fn update_response(
+    response: &HttpResponse,
+    pool: &Pool<Sqlite>,
+) -> Result<HttpResponse, sqlx::Error> {
+    let headers_json = Json(&response.headers);
+    sqlx::query!(
+        r#"
+            UPDATE http_responses SET (
+                elapsed,
+                url,
+                status,
+                status_reason,
+                content_length,
+                body,
+                body_path,
+                error,
+                headers,
+                updated_at
+            ) = (?, ?, ?, ?, ?, ?, ?, ?, ?, CURRENT_TIMESTAMP) WHERE id = ?;
         "#,
         response.elapsed,
         response.url,
         response.status,
         response.status_reason,
+        response.content_length,
         response.body,
+        response.body_path,
         response.error,
         headers_json,
         response.id,
     )
     .execute(pool)
-    .await
-    .expect("Failed to update response");
+    .await?;
     get_response(&response.id, pool).await
 }
 
 pub async fn get_response(id: &str, pool: &Pool<Sqlite>) -> Result<HttpResponse, sqlx::Error> {
-    sqlx::query_as_unchecked!(
+    sqlx::query_as!(
         HttpResponse,
         r#"
-            SELECT id, workspace_id, request_id, updated_at, deleted_at, created_at,
-                status, status_reason, body, elapsed, url, error,
+            SELECT id, model, workspace_id, request_id, updated_at, created_at, url,
+                status, status_reason, content_length, body, body_path, elapsed, error,
                 headers AS "headers!: sqlx::types::Json<Vec<HttpResponseHeader>>"
             FROM http_responses
             WHERE id = ?
@@ -291,12 +721,12 @@ pub async fn find_responses(
     sqlx::query_as!(
         HttpResponse,
         r#"
-            SELECT id, workspace_id, request_id, updated_at, deleted_at,
-                created_at, status, status_reason, body, elapsed, url, error,
+            SELECT id, model, workspace_id, request_id, updated_at, created_at, url,
+                status, status_reason, content_length, body, body_path, elapsed, error,
                 headers AS "headers!: sqlx::types::Json<Vec<HttpResponseHeader>>"
             FROM http_responses
             WHERE request_id = ?
-            ORDER BY created_at ASC
+            ORDER BY created_at DESC
         "#,
         request_id,
     )
@@ -304,7 +734,36 @@ pub async fn find_responses(
     .await
 }
 
-pub async fn delete_response(id: &str, pool: &Pool<Sqlite>) -> Result<(), sqlx::Error> {
+pub async fn find_responses_by_workspace_id(
+    workspace_id: &str,
+    pool: &Pool<Sqlite>,
+) -> Result<Vec<HttpResponse>, sqlx::Error> {
+    sqlx::query_as!(
+        HttpResponse,
+        r#"
+            SELECT id, model, workspace_id, request_id, updated_at, created_at, url,
+                status, status_reason, content_length, body, body_path, elapsed, error,
+                headers AS "headers!: sqlx::types::Json<Vec<HttpResponseHeader>>"
+            FROM http_responses
+            WHERE workspace_id = ?
+            ORDER BY created_at DESC
+        "#,
+        workspace_id,
+    )
+    .fetch_all(pool)
+    .await
+}
+
+pub async fn delete_response(id: &str, pool: &Pool<Sqlite>) -> Result<HttpResponse, sqlx::Error> {
+    let resp = get_response(id, pool).await?;
+
+    // Delete the body file if it exists
+    if let Some(p) = resp.body_path.clone() {
+        if let Err(e) = fs::remove_file(p) {
+            println!("Failed to delete body file: {}", e);
+        };
+    }
+
     let _ = sqlx::query!(
         r#"
             DELETE FROM http_responses
@@ -315,29 +774,23 @@ pub async fn delete_response(id: &str, pool: &Pool<Sqlite>) -> Result<(), sqlx::
     .execute(pool)
     .await;
 
-    Ok(())
+    Ok(resp)
 }
 
 pub async fn delete_all_responses(
     request_id: &str,
     pool: &Pool<Sqlite>,
 ) -> Result<(), sqlx::Error> {
-    let _ = sqlx::query!(
-        r#"
-            DELETE FROM http_responses
-            WHERE request_id = ?
-        "#,
-        request_id,
-    )
-    .execute(pool)
-    .await;
-
+    for r in find_responses(request_id, pool).await? {
+        delete_response(&r.id, pool).await?;
+    }
     Ok(())
 }
 
-pub fn generate_id(prefix: &str) -> String {
-    format!(
-        "{prefix}_{}",
-        Alphanumeric.sample_string(&mut rand::thread_rng(), 10)
-    )
+pub fn generate_id(prefix: Option<&str>) -> String {
+    let id = Alphanumeric.sample_string(&mut rand::thread_rng(), 10);
+    return match prefix {
+        None => id,
+        Some(p) => format!("{p}_{id}"),
+    };
 }

src-tauri/src/plugin.rs

@@ -0,0 +1,187 @@
+use std::fs;
+
+use boa_engine::builtins::promise::PromiseState;
+use boa_engine::{
+    js_string,
+    module::{ModuleLoader, SimpleModuleLoader},
+    property::Attribute,
+    Context, JsArgs, JsNativeError, JsValue, Module, NativeFunction, Source,
+};
+use boa_runtime::Console;
+use serde::{Deserialize, Serialize};
+use serde_json::json;
+use sqlx::{Pool, Sqlite};
+use tauri::AppHandle;
+
+use crate::models::{self, Environment, Folder, HttpRequest, Workspace};
+
+pub fn run_plugin_hello(app_handle: &AppHandle, plugin_name: &str) {
+    run_plugin(app_handle, plugin_name, "hello", &[]);
+}
+
+#[derive(Default, Debug, Deserialize, Serialize)]
+pub struct ImportedResources {
+    workspaces: Vec<Workspace>,
+    environments: Vec<Environment>,
+    folders: Vec<Folder>,
+    requests: Vec<HttpRequest>,
+}
+
+pub async fn run_plugin_import(
+    app_handle: &AppHandle,
+    pool: &Pool<Sqlite>,
+    plugin_name: &str,
+    file_path: &str,
+) -> ImportedResources {
+    let file = fs::read_to_string(file_path)
+        .expect(format!("Unable to read file {}", file_path.to_string()).as_str());
+    let file_contents = file.as_str();
+    let result_json = run_plugin(
+        app_handle,
+        plugin_name,
+        "pluginHookImport",
+        &[js_string!(file_contents).into()],
+    );
+    let resources: ImportedResources =
+        serde_json::from_value(result_json).expect("failed to parse result json");
+    let mut imported_resources = ImportedResources::default();
+
+    println!("Importing resources");
+    for w in resources.workspaces {
+        println!("Importing workspace: {:?}", w);
+        let x = models::upsert_workspace(&pool, w)
+            .await
+            .expect("Failed to create workspace");
+        imported_resources.workspaces.push(x.clone());
+        println!("Imported workspace: {}", x.name);
+    }
+
+    for e in resources.environments {
+        println!("Importing environment: {:?}", e);
+        let x = models::upsert_environment(&pool, e)
+            .await
+            .expect("Failed to create environment");
+        imported_resources.environments.push(x.clone());
+        println!("Imported environment: {}", x.name);
+    }
+
+    for f in resources.folders {
+        println!("Importing folder: {:?}", f);
+        let x = models::upsert_folder(&pool, f)
+            .await
+            .expect("Failed to create folder");
+        imported_resources.folders.push(x.clone());
+        println!("Imported folder: {}", x.name);
+    }
+
+    for r in resources.requests {
+        println!("Importing request: {:?}", r);
+        let x = models::upsert_request(&pool, r)
+            .await
+            .expect("Failed to create request");
+        imported_resources.requests.push(x.clone());
+        println!("Imported request: {}", x.name);
+    }
+
+    imported_resources
+}
+
+fn run_plugin(
+    app_handle: &AppHandle,
+    plugin_name: &str,
+    entrypoint: &str,
+    js_args: &[JsValue],
+) -> serde_json::Value {
+    let plugin_dir = app_handle
+        .path_resolver()
+        .resolve_resource("plugins")
+        .expect("failed to resolve plugin directory resource")
+        .join(plugin_name);
+    let plugin_index_file = plugin_dir.join("out/index.js");
+
+    println!("Plugin dir={:?} file={:?}", plugin_dir, plugin_index_file);
+
+    // Module loader for the specific plugin
+    let loader = &SimpleModuleLoader::new(plugin_dir).expect("failed to create module loader");
+    let dyn_loader: &dyn ModuleLoader = loader;
+
+    let context = &mut Context::builder()
+        .module_loader(dyn_loader)
+        .build()
+        .expect("failed to create context");
+
+    add_runtime(context);
+    add_globals(context);
+
+    let source = Source::from_filepath(&plugin_index_file).expect("Error opening file");
+
+    // Can also pass a `Some(realm)` if you need to execute the module in another realm.
+    let module = Module::parse(source, None, context).expect("failed to parse module");
+
+    // Insert parsed entrypoint into the module loader
+    // TODO: Is this needed if loaded from file already?
+    loader.insert(plugin_index_file, module.clone());
+
+    let promise_result = module
+        .load_link_evaluate(context)
+        .expect("failed to evaluate module");
+
+    // Very important to push forward the job queue after queueing promises.
+    context.run_jobs();
+
+    // Checking if the final promise didn't return an error.
+    match promise_result.state().expect("failed to get promise state") {
+        PromiseState::Pending => {
+            panic!("Promise was pending");
+        }
+        PromiseState::Fulfilled(v) => {
+            assert_eq!(v, JsValue::undefined())
+        }
+        PromiseState::Rejected(err) => {
+            panic!("Failed to link: {}", err.display());
+        }
+    }
+
+    let namespace = module.namespace(context);
+
+    let result = namespace
+        .get(js_string!(entrypoint), context)
+        .expect("failed to get entrypoint")
+        .as_callable()
+        .cloned()
+        .ok_or_else(|| JsNativeError::typ().with_message("export wasn't a function!"))
+        .expect("Failed to get entrypoint")
+        .call(&JsValue::undefined(), js_args, context)
+        .expect("Failed to call entrypoint");
+
+    match result.is_undefined() {
+        true => json!(null), // to_json doesn't work with undefined (yet)
+        false => result
+            .to_json(context)
+            .expect("failed to convert result to json"),
+    }
+}
+
+fn add_runtime(context: &mut Context<'_>) {
+    let console = Console::init(context);
+    context
+        .register_global_property(js_string!(Console::NAME), console, Attribute::all())
+        .expect("the console builtin shouldn't exist");
+}
+
+fn add_globals(context: &mut Context<'_>) {
+    context
+        .register_global_builtin_callable(
+            "sayHello",
+            1,
+            NativeFunction::from_fn_ptr(|_, args, context| {
+                let value: String = args
+                    .get_or_undefined(0)
+                    .try_js_into(context)
+                    .expect("failed to convert arg");
+                println!("Hello {}!", value);
+                Ok(value.into())
+            }),
+        )
+        .expect("failed to register global");
+}

src-tauri/src/render.rs

@@ -0,0 +1,32 @@
+use crate::models::{Environment, Workspace};
+use std::collections::HashMap;
+use tauri::regex::Regex;
+
+pub fn render(template: &str, workspace: &Workspace, environment: Option<&Environment>) -> String {
+    let mut map = HashMap::new();
+    let workspace_variables = &workspace.variables.0;
+    for variable in workspace_variables {
+        if !variable.enabled || variable.value.is_empty() {
+            continue;
+        }
+        map.insert(variable.name.as_str(), variable.value.as_str());
+    }
+
+    if let Some(e) = environment {
+        let environment_variables = &e.variables.0;
+        for variable in environment_variables {
+            if !variable.enabled || variable.value.is_empty() {
+                continue;
+            }
+            map.insert(variable.name.as_str(), variable.value.as_str());
+        }
+    }
+
+    Regex::new(r"\$\{\[\s*([^]\s]+)\s*]}")
+        .expect("Failed to create regex")
+        .replace_all(template, |caps: &tauri::regex::Captures| {
+            let key = caps.get(1).unwrap().as_str();
+            map.get(key).unwrap_or(&"")
+        })
+        .to_string()
+}

src-tauri/src/runtime.js

@@ -1,16 +0,0 @@
-(function (globalThis) {
-  // Deno.core.print(Object.keys(Deno.core).join('\n'));
-
-  function argsToMessage(...args) {
-    return args.map((arg) => JSON.stringify(arg)).join(' ');
-  }
-
-  globalThis.console = {
-    log: (...args) => {
-      Deno.core.print(`[log]: ${argsToMessage(...args)}\n`, false);
-    },
-    error: (...args) => {
-      Deno.core.print(`[err]: ${argsToMessage(...args)}\n`, true);
-    },
-  };
-})(globalThis);

src-tauri/src/runtime.rs

@@ -1,117 +0,0 @@
-use deno_ast::{MediaType, ParseParams, SourceTextInfo};
-use deno_core::error::AnyError;
-use deno_core::{op, Extension, JsRuntime, ModuleSource, ModuleType, RuntimeOptions};
-use std::rc::Rc;
-
-use deno_core::futures::FutureExt;
-use futures::executor;
-
-pub fn run_plugin_sync(file_path: &str) -> Result<(), AnyError> {
-    executor::block_on(run_plugin(file_path))
-}
-
-pub async fn run_plugin(file_path: &str) -> Result<(), AnyError> {
-    let extension = Extension::builder("runtime")
-        .ops(vec![op_hello::decl()])
-        .build();
-
-    // Initialize a runtime instance
-    let mut runtime = JsRuntime::new(RuntimeOptions {
-        module_loader: Some(Rc::new(TsModuleLoader)),
-        extensions: vec![extension],
-        ..Default::default()
-    });
-
-    runtime
-        .execute_script("<runtime>", include_str!("runtime.js"))
-        .expect("Failed to execute runtime.js");
-
-    let main_module = deno_core::resolve_path(file_path).expect("Failed to resolve path");
-    let mod_id = runtime
-        .load_main_module(&main_module, None)
-        .await
-        .expect("Failed to load main module");
-    let result = runtime.mod_evaluate(mod_id);
-    runtime
-        .run_event_loop(false)
-        .await
-        .expect("Failed to run event loop");
-    result.await?
-}
-
-#[op]
-async fn op_hello(name: String) -> Result<String, AnyError> {
-    let contents = format!("Hello {} from Rust!", name);
-    println!("{}", contents);
-    Ok(contents)
-}
-
-struct TsModuleLoader;
-
-impl deno_core::ModuleLoader for TsModuleLoader {
-    fn resolve(
-        &self,
-        specifier: &str,
-        referrer: &str,
-        _kind: deno_core::ResolutionKind,
-    ) -> Result<deno_core::ModuleSpecifier, AnyError> {
-        deno_core::resolve_import(specifier, referrer).map_err(|e| e.into())
-    }
-
-    fn load(
-        &self,
-        module_specifier: &deno_core::ModuleSpecifier,
-        _maybe_referrer: Option<deno_core::ModuleSpecifier>,
-        _is_dyn_import: bool,
-    ) -> std::pin::Pin<Box<deno_core::ModuleSourceFuture>> {
-        let module_specifier = module_specifier.clone();
-        async move {
-            let path = module_specifier.to_file_path().unwrap();
-
-            // Determine what the MediaType is (this is done based on the file
-            // extension) and whether transpiling is required.
-            let media_type = MediaType::from(&path);
-            let (module_type, should_transpile) = match MediaType::from(&path) {
-                MediaType::JavaScript | MediaType::Mjs | MediaType::Cjs => {
-                    (ModuleType::JavaScript, false)
-                }
-                MediaType::Jsx => (ModuleType::JavaScript, true),
-                MediaType::TypeScript
-                | MediaType::Mts
-                | MediaType::Cts
-                | MediaType::Dts
-                | MediaType::Dmts
-                | MediaType::Dcts
-                | MediaType::Tsx => (ModuleType::JavaScript, true),
-                MediaType::Json => (ModuleType::Json, false),
-                _ => panic!("Unknown extension {:?}", path.extension()),
-            };
-
-            // Read the file, transpile if necessary.
-            let code = std::fs::read_to_string(&path)?;
-            let code = if should_transpile {
-                let parsed = deno_ast::parse_module(ParseParams {
-                    specifier: module_specifier.to_string(),
-                    text_info: SourceTextInfo::from_string(code),
-                    media_type,
-                    capture_tokens: false,
-                    scope_analysis: false,
-                    maybe_syntax: None,
-                })?;
-                parsed.transpile(&Default::default())?.text
-            } else {
-                code
-            };
-
-            // Load and return module.
-            let module = ModuleSource {
-                code: code.into_bytes().into_boxed_slice(),
-                module_type,
-                module_url_specified: module_specifier.to_string(),
-                module_url_found: module_specifier.to_string(),
-            };
-            Ok(module)
-        }
-        .boxed_local()
-    }
-}

src-tauri/src/window_ext.rs

@@ -1,13 +1,18 @@
 use tauri::{Runtime, Window};
 
-const TRAFFIC_LIGHT_OFFSET_X: f64 = 15.0;
-const TRAFFIC_LIGHT_OFFSET_Y: f64 = 22.0;
+const TRAFFIC_LIGHT_OFFSET_X: f64 = 13.0;
+const TRAFFIC_LIGHT_OFFSET_Y: f64 = 18.0;
 
-pub trait WindowExt {
+pub trait TrafficLightWindowExt {
     fn position_traffic_lights(&self);
 }
 
-impl<R: Runtime> WindowExt for Window<R> {
+impl<R: Runtime> TrafficLightWindowExt for Window<R> {
+    #[cfg(not(target_os = "macos"))]
+    fn position_traffic_lights(&self) {
+        // No-op
+    }
+
     #[cfg(target_os = "macos")]
     fn position_traffic_lights(&self) {
         use cocoa::appkit::{NSView, NSWindow, NSWindowButton};

src-tauri/src/window_menu.rs

@@ -0,0 +1,119 @@
+use tauri::{AboutMetadata, CustomMenuItem, Menu, MenuItem, Submenu};
+
+pub fn os_default(#[allow(unused)] app_name: &str) -> Menu {
+    let mut menu = Menu::new();
+    #[cfg(target_os = "macos")]
+    {
+        menu = menu.add_submenu(Submenu::new(
+            app_name,
+            Menu::new()
+                .add_native_item(MenuItem::About(
+                    app_name.to_string(),
+                    AboutMetadata::default(),
+                ))
+                .add_native_item(MenuItem::Separator)
+                .add_native_item(MenuItem::Services)
+                .add_native_item(MenuItem::Separator)
+                .add_native_item(MenuItem::Hide)
+                .add_native_item(MenuItem::HideOthers)
+                .add_native_item(MenuItem::ShowAll)
+                .add_native_item(MenuItem::Separator)
+                .add_native_item(MenuItem::Quit),
+        ));
+    }
+
+    let mut file_menu = Menu::new();
+    file_menu = file_menu.add_native_item(MenuItem::CloseWindow);
+    #[cfg(not(target_os = "macos"))]
+    {
+        file_menu = file_menu.add_native_item(MenuItem::Quit);
+    }
+    menu = menu.add_submenu(Submenu::new("File", file_menu));
+
+    #[cfg(not(target_os = "linux"))]
+    let mut edit_menu = Menu::new();
+    #[cfg(target_os = "macos")]
+    {
+        edit_menu = edit_menu.add_native_item(MenuItem::Undo);
+        edit_menu = edit_menu.add_native_item(MenuItem::Redo);
+        edit_menu = edit_menu.add_native_item(MenuItem::Separator);
+    }
+    #[cfg(not(target_os = "linux"))]
+    {
+        edit_menu = edit_menu.add_native_item(MenuItem::Cut);
+        edit_menu = edit_menu.add_native_item(MenuItem::Copy);
+        edit_menu = edit_menu.add_native_item(MenuItem::Paste);
+    }
+    #[cfg(target_os = "macos")]
+    {
+        edit_menu = edit_menu.add_native_item(MenuItem::SelectAll);
+    }
+    #[cfg(not(target_os = "linux"))]
+    {
+        menu = menu.add_submenu(Submenu::new("Edit", edit_menu));
+    }
+    let mut view_menu = Menu::new();
+    #[cfg(target_os = "macos")]
+    {
+        view_menu = view_menu
+            .add_native_item(MenuItem::EnterFullScreen)
+            .add_native_item(MenuItem::Separator);
+    }
+    view_menu = view_menu
+        .add_item(
+            CustomMenuItem::new("zoom_reset".to_string(), "Zoom to Actual Size")
+                .accelerator("CmdOrCtrl+0"),
+        )
+        .add_item(
+            CustomMenuItem::new("zoom_in".to_string(), "Zoom In").accelerator("CmdOrCtrl+Plus"),
+        )
+        .add_item(
+            CustomMenuItem::new("zoom_out".to_string(), "Zoom Out").accelerator("CmdOrCtrl+-"),
+        )
+        .add_native_item(MenuItem::Separator)
+        .add_item(
+            CustomMenuItem::new("toggle_sidebar".to_string(), "Toggle Sidebar")
+                .accelerator("CmdOrCtrl+b"),
+        )
+        .add_item(
+            CustomMenuItem::new("focus_sidebar".to_string(), "Focus Sidebar")
+                .accelerator("CmdOrCtrl+1"),
+        )
+        .add_item(
+            CustomMenuItem::new("toggle_settings".to_string(), "Toggle Settings")
+                .accelerator("CmdOrCtrl+,"),
+        )
+        .add_item(
+            CustomMenuItem::new("focus_url".to_string(), "Focus URL").accelerator("CmdOrCtrl+l"),
+        );
+    menu = menu.add_submenu(Submenu::new("View", view_menu));
+
+    let mut window_menu = Menu::new();
+    window_menu = window_menu.add_native_item(MenuItem::Minimize);
+    #[cfg(target_os = "macos")]
+    {
+        window_menu = window_menu.add_native_item(MenuItem::Zoom);
+        window_menu = window_menu.add_native_item(MenuItem::Separator);
+    }
+    window_menu = window_menu.add_native_item(MenuItem::CloseWindow);
+    menu = menu.add_submenu(Submenu::new("Window", window_menu));
+
+    menu = menu.add_submenu(Submenu::new(
+        "Workspace",
+        Menu::new()
+            .add_item(
+                CustomMenuItem::new("send_request".to_string(), "Send Request")
+                    .accelerator("CmdOrCtrl+r"),
+            )
+            .add_item(
+                CustomMenuItem::new("new_request".to_string(), "New Request")
+                    .accelerator("CmdOrCtrl+n"),
+            )
+            .add_item(
+                CustomMenuItem::new("duplicate_request".to_string(), "Duplicate Request")
+                    .accelerator("CmdOrCtrl+d"),
+            ),
+    ));
+
+    menu
+}

src-tauri/tauri.conf.json

@@ -8,25 +8,43 @@
   },
   "package": {
     "productName": "Yaak",
-    "version": "0.0.1"
+    "version": "2023.2.0"
   },
   "tauri": {
-    "windows": [
-      {
-        "fullscreen": false,
-        "height": 800,
-        "hiddenTitle": true,
-        "resizable": true,
-        "title": "Yaak",
-        "titleBarStyle": "Overlay",
-        "width": 1400
+    "windows": [],
+    "cli": {
+      "description": "Yaak CLI",
+      "longDescription": "This is the Yaak CLI, yo",
+      "beforeHelp": "u can use it to build, develop and manage your Yaak application.",
+      "afterHelp": "Have fun!",
+      "args": [],
+      "subcommands": {
+        "import": {
+          "args": [{
+            "name": "file",
+            "short": "f",
+            "takesValue": true
+          }]
+        },
+        "hello": {}
       }
-    ],
+    },
     "allowlist": {
       "all": false,
+      "os": {
+        "all": true
+      },
+      "protocol": {
+        "assetScope": [
+          "$APPDATA/responses/*"
+        ],
+        "asset": true
+      },
       "fs": {
+        "readFile": true,
         "scope": [
-          "$RESOURCE/*"
+          "$RESOURCE/*",
+          "$APPDATA/responses/*"
         ]
       },
       "shell": {
@@ -35,6 +53,10 @@
       },
       "window": {
         "startDragging": true
+      },
+      "dialog": {
+        "all": false,
+        "open": true
       }
     },
     "bundle": {
@@ -50,18 +72,26 @@
         "icons/icon.ico"
       ],
       "identifier": "co.schier.yaak",
-      "longDescription": "",
+      "longDescription": "The best cross-platform visual API client",
       "resources": [
-        "plugins/*",
-        "migrations/*"
+        "migrations/*",
+        "plugins/*"
+      ],
+      "shortDescription": "The best API client",
+      "targets": [
+        "deb",
+        "appimage",
+        "nsis",
+        "app",
+        "dmg",
+        "updater"
       ],
-      "shortDescription": "",
-      "targets": "all",
       "deb": {
         "depends": []
       },
       "macOS": {
         "exceptionDomain": "",
+        "entitlements": "macos/entitlements.plist",
         "frameworks": []
       },
       "windows": {
@@ -78,7 +108,7 @@
       "active": true,
       "dialog": true,
       "endpoints": [
-        "https://update.yaak.app/check/{{target}}/{{current_version}}"
+        "https://update.yaak.app/check/{{target}}/{{arch}}/{{current_version}}"
       ],
       "pubkey": "dW50cnVzdGVkIGNvbW1lbnQ6IG1pbmlzaWduIHB1YmxpYyBrZXk6IEMxRDJFREQ1MjExQjdGN0IKUldSN2Z4c2gxZTNTd1FHNCtmYnFXMHVVQzhuNkJOM1cwOFBodmdLall3ckhKenpKUytHSTR1MlkK"
     }

src-web/Workspace.tsx

@@ -1,55 +0,0 @@
-import classnames from 'classnames';
-import { useWindowSize } from 'react-use';
-import { RequestPane } from './components/RequestPane';
-import { ResponsePane } from './components/ResponsePane';
-import { Sidebar } from './components/Sidebar';
-import { HStack } from './components/Stacks';
-import { WindowDragRegion } from './components/WindowDragRegion';
-import { useRequests } from './hooks/useRequest';
-
-type Params = {
-  workspaceId: string;
-  requestId?: string;
-};
-
-export function Workspace({ matches }: { path: string; matches?: Params }) {
-  const workspaceId = matches?.workspaceId ?? '';
-  const { data: requests } = useRequests(workspaceId);
-  const request = requests?.find((r) => r.id === matches?.requestId);
-  const { width } = useWindowSize();
-  const isH = width > 900;
-
-  return (
-    <div className="grid grid-cols-[auto_1fr] h-full text-gray-900">
-      <Sidebar
-        requests={requests ?? []}
-        workspaceId={workspaceId}
-        activeRequestId={matches?.requestId}
-      />
-      {request && (
-        <div className="grid grid-rows-[auto_minmax(0,1fr)] h-full">
-          <HStack
-            as={WindowDragRegion}
-            className="px-3 bg-gray-50 text-gray-900 border-b border-b-gray-200 pt-[1px]"
-            alignItems="center"
-          >
-            {request.name}
-          </HStack>
-          <div
-            className={classnames(
-              'grid overflow-auto',
-              isH ? 'grid-cols-[1fr_1fr]' : 'grid-rows-[minmax(0,auto)_minmax(0,100%)]',
-            )}
-          >
-            <RequestPane
-              fullHeight={isH}
-              request={request}
-              className={classnames(!isH && 'pr-2 pb-0')}
-            />
-            <ResponsePane requestId={request.id} />
-          </div>
-        </div>
-      )}
-    </div>
-  );
-}

src-web/assets/icons/LeftPanelHiddenIcon.svg

@@ -0,0 +1,5 @@
+<svg width="100%" height="100%" viewBox="0 0 15 15" version="1.1" xmlns="http://www.w3.org/2000/svg"
+     style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
+        <path fill="currentColor"
+              d="M2.5,1C1.672,1 1,1.672 1,2.5L1,12.5C1,13.328 1.672,14 2.5,14L12.5,14C13.328,14 14,13.328 14,12.5L14,2.5C14,1.672 13.328,1 12.5,1L2.5,1ZM12.5,13C12.776,13 13,12.776 13,12.5L13,2.5C13,2.224 12.776,2 12.5,2L6,2L6,13L12.5,13ZM2.5,2L5,2L5,13L2.5,13C2.224,13 2,12.776 2,12.5L2,2.5C2,2.224 2.224,2 2.5,2Z"/>
+</svg>

src-web/assets/icons/LeftPanelVisibleIcon.svg

@@ -0,0 +1,6 @@
+<svg width="100%" height="100%" viewBox="0 0 15 15" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
+            <rect x="0" y="0" width="15" height="15" style="fill:none;"/>
+            <g transform="matrix(1,0,0,1,-16,-8.88178e-16)">
+                <path fill="currentColor" d="M18.5,1C17.672,1 17,1.672 17,2.5L17,12.5C17,13.328 17.672,14 18.5,14L28.5,14C29.328,14 30,13.328 30,12.5L30,2.5C30,1.672 29.328,1 28.5,1L18.5,1ZM28.5,13C28.776,13 29,12.776 29,12.5L29,2.5C29,2.224 28.776,2 28.5,2L22,2L22,13L28.5,13ZM18,11.535L21,12.285L21,13L18.5,13C18.224,13 18,12.776 18,12.5L18,11.535ZM18,10.504L21,11.254L21,9.81L18,9.06L18,10.504ZM18,8.029L21,8.779L21,7.327L18,6.577L18,8.029ZM18,5.546L21,6.296L21,4.833L18,4.083L18,5.546ZM21,3.802L18,3.052L18,2.5C18,2.224 18.224,2 18.5,2L21,2L21,3.802Z"/>
+            </g>
+</svg>

src-web/components/App.tsx

@@ -0,0 +1,35 @@
+import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
+import { MotionConfig } from 'framer-motion';
+import { Suspense } from 'react';
+import { DndProvider } from 'react-dnd';
+import { HTML5Backend } from 'react-dnd-html5-backend';
+import { HelmetProvider } from 'react-helmet-async';
+import { AppRouter } from './AppRouter';
+
+const queryClient = new QueryClient({
+  logger: undefined,
+  defaultOptions: {
+    queries: {
+      retry: false,
+      refetchOnWindowFocus: true,
+      networkMode: 'offlineFirst',
+    },
+  },
+});
+
+export function App() {
+  return (
+    <QueryClientProvider client={queryClient}>
+      <MotionConfig transition={{ duration: 0.1 }}>
+        <HelmetProvider>
+          <DndProvider backend={HTML5Backend}>
+              <Suspense>
+                <AppRouter />
+                {/*<ReactQueryDevtools initialIsOpen={false} />*/}
+              </Suspense>
+          </DndProvider>
+        </HelmetProvider>
+      </MotionConfig>
+    </QueryClientProvider>
+  );
+}

src-web/components/AppRouter.tsx

@@ -1,13 +1,81 @@
-import { Router } from 'preact-router';
-import { Workspaces } from '../pages/Workspaces';
-import { Workspace } from '../Workspace';
+import { createBrowserRouter, Navigate, Outlet, RouterProvider } from 'react-router-dom';
+import { routePaths, useAppRoutes } from '../hooks/useAppRoutes';
+import { useRecentRequests } from '../hooks/useRecentRequests';
+import { useRequests } from '../hooks/useRequests';
+import { GlobalHooks } from './GlobalHooks';
+import Workspace from './Workspace';
+import Workspaces from './Workspaces';
+import { DialogProvider } from './DialogContext';
+import { useActiveEnvironmentId } from '../hooks/useActiveEnvironmentId';
+import RouteError from './RouteError';
+
+const router = createBrowserRouter([
+  {
+    path: '/',
+    errorElement: <RouteError />,
+    element: <Layout />,
+    children: [
+      {
+        path: '/',
+        element: <Navigate to={routePaths.workspaces()} replace={true} />,
+      },
+      {
+        path: routePaths.workspaces(),
+        element: <Workspaces />,
+      },
+      {
+        path: routePaths.workspace({
+          workspaceId: ':workspaceId',
+          environmentId: ':environmentId',
+        }),
+        element: <WorkspaceOrRedirect />,
+      },
+      {
+        path: routePaths.request({
+          workspaceId: ':workspaceId',
+          environmentId: ':environmentId',
+          requestId: ':requestId',
+        }),
+        element: <Workspace />,
+      },
+    ],
+  },
+]);
 
 export function AppRouter() {
+  return <RouterProvider router={router} />;
+}
+
+function WorkspaceOrRedirect() {
+  const recentRequests = useRecentRequests();
+  const activeEnvironmentId = useActiveEnvironmentId();
+  const requests = useRequests();
+  const request = requests.find((r) => r.id === recentRequests[0]);
+  const routes = useAppRoutes();
+
+  if (request === undefined) {
+    return <Workspace />;
+  }
+
+  const { id: requestId, workspaceId } = request;
+  const environmentId = activeEnvironmentId ?? undefined;
+
   return (
-    <Router>
-      <Workspaces path="/" />
-      <Workspace path="/workspaces/:workspaceId" />
-      <Workspace path="/workspaces/:workspaceId/requests/:requestId" />
-    </Router>
+    <Navigate
+      to={routes.paths.request({
+        workspaceId,
+        environmentId,
+        requestId,
+      })}
+    />
+  );
+}
+
+function Layout() {
+  return (
+    <DialogProvider>
+      <Outlet />
+      <GlobalHooks />
+    </DialogProvider>
   );
 }

src-web/components/BasicAuth.tsx

@@ -0,0 +1,45 @@
+import { useUpdateRequest } from '../hooks/useUpdateRequest';
+import type { HttpRequest } from '../lib/models';
+import { Input } from './core/Input';
+import { VStack } from './core/Stacks';
+
+interface Props {
+  requestId: string;
+  authentication: HttpRequest['authentication'];
+}
+
+export function BasicAuth({ requestId, authentication }: Props) {
+  const updateRequest = useUpdateRequest(requestId);
+
+  return (
+    <VStack className="my-2" space={2}>
+      <Input
+        useTemplating
+        label="Username"
+        name="username"
+        size="sm"
+        defaultValue={`${authentication.username}`}
+        onChange={(username: string) => {
+          updateRequest.mutate((r) => ({
+            ...r,
+            authentication: { password: r.authentication.password, username },
+          }));
+        }}
+      />
+      <Input
+        useTemplating
+        label="Password"
+        name="password"
+        size="sm"
+        type="password"
+        defaultValue={`${authentication.password}`}
+        onChange={(password: string) => {
+          updateRequest.mutate((r) => ({
+            ...r,
+            authentication: { username: r.authentication.username, password },
+          }));
+        }}
+      />
+    </VStack>
+  );
+}

src-web/components/BearerAuth.tsx

@@ -0,0 +1,33 @@
+import { useUpdateRequest } from '../hooks/useUpdateRequest';
+import type { HttpRequest } from '../lib/models';
+import { Input } from './core/Input';
+import { VStack } from './core/Stacks';
+
+interface Props {
+  requestId: string;
+  authentication: HttpRequest['authentication'];
+}
+
+export function BearerAuth({ requestId, authentication }: Props) {
+  const updateRequest = useUpdateRequest(requestId);
+
+  return (
+    <VStack className="my-2" space={2}>
+      <Input
+        useTemplating
+        autocompleteVariables
+        type="password"
+        label="Token"
+        name="token"
+        size="sm"
+        defaultValue={`${authentication.token}`}
+        onChange={(token: string) => {
+          updateRequest.mutate((r) => ({
+            ...r,
+            authentication: { token },
+          }));
+        }}
+      />
+    </VStack>
+  );
+}

src-web/components/Button.tsx

@@ -1,63 +0,0 @@
-import classnames from 'classnames';
-import type { ComponentChildren } from 'preact';
-import type { ForwardedRef } from 'preact/compat';
-import { forwardRef } from 'preact/compat';
-import { Icon } from './Icon';
-
-const colorStyles = {
-  custom: '',
-  default: 'text-gray-700 enabled:hover:bg-gray-700/10 enabled:hover:text-gray-1000',
-  gray: 'text-gray-800 bg-gray-100 enabled:hover:bg-gray-500/20 enabled:hover:text-gray-1000',
-  primary: 'bg-blue-400 text-white hover:bg-blue-500',
-  secondary: 'bg-violet-400 text-white hover:bg-violet-500',
-  warning: 'bg-orange-400 text-white hover:bg-orange-500',
-  danger: 'bg-red-400 text-white hover:bg-red-500',
-};
-
-export type ButtonProps = {
-  color?: keyof typeof colorStyles;
-  size?: 'sm' | 'md';
-  justify?: 'start' | 'center';
-  type?: 'button' | 'submit';
-  onClick?: (event: MouseEvent) => void;
-  forDropdown?: boolean;
-  className?: string;
-  children?: ComponentChildren;
-  disabled?: boolean;
-  title?: string;
-  tabIndex?: number;
-};
-
-export const Button = forwardRef(function Button(
-  {
-    className,
-    children,
-    forDropdown,
-    color,
-    justify = 'center',
-    size = 'md',
-    ...props
-  }: ButtonProps,
-  ref: ForwardedRef<HTMLButtonElement>,
-) {
-  return (
-    <button
-      ref={ref}
-      className={classnames(
-        className,
-        'outline-none',
-        'border border-transparent focus-visible:border-blue-300',
-        'rounded-md flex items-center',
-        colorStyles[color || 'default'],
-        justify === 'start' && 'justify-start',
-        justify === 'center' && 'justify-center',
-        size === 'md' && 'h-9 px-3',
-        size === 'sm' && 'h-7 px-2.5 text-sm',
-      )}
-      {...props}
-    >
-      {children}
-      {forDropdown && <Icon icon="triangleDown" className="ml-1 -mr-1" />}
-    </button>
-  );
-});

src-web/components/ButtonLink.tsx

@@ -1,17 +0,0 @@
-import classnames from 'classnames';
-import { Link } from 'preact-router';
-import type { ButtonProps } from './Button';
-import { Button } from './Button';
-
-type Props = ButtonProps & {
-  href: string;
-};
-
-export function ButtonLink({ href, className, ...buttonProps }: Props) {
-  const linkProps = { href };
-  return (
-    <Link {...linkProps}>
-      <Button className={classnames(className, 'w-full')} tabIndex={-1} {...buttonProps} />
-    </Link>
-  );
-}

src-web/components/Colors.tsx

@@ -1,104 +0,0 @@
-import classnames from 'classnames';
-import { HStack, VStack } from './Stacks';
-
-export function Colors() {
-  return (
-    <HStack>
-      <VStack>
-        <Color className="bg-gray-50" />
-        <Color className="bg-gray-100" />
-        <Color className="bg-gray-200" />
-        <Color className="bg-gray-300" />
-        <Color className="bg-gray-400" />
-        <Color className="bg-gray-500" />
-        <Color className="bg-gray-600" />
-        <Color className="bg-gray-700" />
-        <Color className="bg-gray-800" />
-        <Color className="bg-gray-900" />
-        <Color className="bg-gray-950" />
-      </VStack>
-      <VStack>
-        <Color className="bg-red-50" />
-        <Color className="bg-red-100" />
-        <Color className="bg-red-200" />
-        <Color className="bg-red-300" />
-        <Color className="bg-red-400" />
-        <Color className="bg-red-500" />
-        <Color className="bg-red-600" />
-        <Color className="bg-red-700" />
-        <Color className="bg-red-800" />
-        <Color className="bg-red-900" />
-        <Color className="bg-red-950" />
-      </VStack>
-      <VStack>
-        <Color className="bg-orange-50" />
-        <Color className="bg-orange-100" />
-        <Color className="bg-orange-200" />
-        <Color className="bg-orange-300" />
-        <Color className="bg-orange-400" />
-        <Color className="bg-orange-500" />
-        <Color className="bg-orange-600" />
-        <Color className="bg-orange-700" />
-        <Color className="bg-orange-800" />
-        <Color className="bg-orange-900" />
-        <Color className="bg-orange-950" />
-      </VStack>
-      <VStack>
-        <Color className="bg-yellow-50" />
-        <Color className="bg-yellow-100" />
-        <Color className="bg-yellow-200" />
-        <Color className="bg-yellow-300" />
-        <Color className="bg-yellow-400" />
-        <Color className="bg-yellow-500" />
-        <Color className="bg-yellow-600" />
-        <Color className="bg-yellow-700" />
-        <Color className="bg-yellow-800" />
-        <Color className="bg-yellow-900" />
-        <Color className="bg-yellow-950" />
-      </VStack>
-      <VStack>
-        <Color className="bg-green-50" />
-        <Color className="bg-green-100" />
-        <Color className="bg-green-200" />
-        <Color className="bg-green-300" />
-        <Color className="bg-green-400" />
-        <Color className="bg-green-500" />
-        <Color className="bg-green-600" />
-        <Color className="bg-green-700" />
-        <Color className="bg-green-800" />
-        <Color className="bg-green-900" />
-        <Color className="bg-green-950" />
-      </VStack>
-      <VStack>
-        <Color className="bg-blue-50" />
-        <Color className="bg-blue-100" />
-        <Color className="bg-blue-200" />
-        <Color className="bg-blue-300" />
-        <Color className="bg-blue-400" />
-        <Color className="bg-blue-500" />
-        <Color className="bg-blue-600" />
-        <Color className="bg-blue-700" />
-        <Color className="bg-blue-800" />
-        <Color className="bg-blue-900" />
-        <Color className="bg-blue-950" />
-      </VStack>
-      <VStack>
-        <Color className="bg-violet-50" />
-        <Color className="bg-violet-100" />
-        <Color className="bg-violet-200" />
-        <Color className="bg-violet-300" />
-        <Color className="bg-violet-400" />
-        <Color className="bg-violet-500" />
-        <Color className="bg-violet-600" />
-        <Color className="bg-violet-700" />
-        <Color className="bg-violet-800" />
-        <Color className="bg-violet-900" />
-        <Color className="bg-violet-950" />
-      </VStack>
-    </HStack>
-  );
-}
-
-function Color({ className }: { className: string }) {
-  return <div className={classnames(className, 'w-full h-5')} />;
-}

src-web/components/Dialog.tsx

@@ -1,58 +0,0 @@
-import * as D from '@radix-ui/react-dialog';
-import classnames from 'classnames';
-import { motion } from 'framer-motion';
-import type { ComponentChildren } from 'preact';
-import { IconButton } from './IconButton';
-import { HStack, VStack } from './Stacks';
-
-interface Props {
-  children: ComponentChildren;
-  open: boolean;
-  onOpenChange: (open: boolean) => void;
-  title: string;
-  description?: string;
-  className?: string;
-  wide?: boolean;
-}
-
-export function Dialog({
-  children,
-  className,
-  wide,
-  open,
-  onOpenChange,
-  title,
-  description,
-}: Props) {
-  return (
-    <D.Root open={open} onOpenChange={onOpenChange}>
-      <D.Portal container={document.querySelector<HTMLElement>('#radix-portal')}>
-        <motion.div initial={{ opacity: 0 }} animate={{ opacity: 1 }}>
-          <D.Overlay className="fixed inset-0 bg-gray-600/60 dark:bg-black/50" />
-          <D.Content>
-            <div
-              className={classnames(
-                className,
-                'absolute top-[50%] left-[50%] translate-x-[-50%] translate-y-[-50%] bg-gray-100',
-                'w-[20rem] max-h-[80vh] p-5 rounded-lg overflow-auto',
-                'dark:border border-gray-200 shadow-md shadow-black/10',
-                wide && 'w-[80vw] max-w-[50rem]',
-              )}
-            >
-              <D.Close asChild className="ml-auto absolute right-1 top-1">
-                <IconButton aria-label="Close" icon="x" size="sm" />
-              </D.Close>
-              <VStack space={3}>
-                <HStack alignItems="center" className="pb-3">
-                  <D.Title className="text-xl font-semibold">{title}</D.Title>
-                </HStack>
-                {description && <D.Description>{description}</D.Description>}
-                <div>{children}</div>
-              </VStack>
-            </div>
-          </D.Content>
-        </motion.div>
-      </D.Portal>
-    </D.Root>
-  );
-}

src-web/components/DialogContext.tsx

@@ -0,0 +1,65 @@
+import React, { createContext, useContext, useMemo, useState } from 'react';
+import type { DialogProps } from './core/Dialog';
+import { Dialog } from './core/Dialog';
+
+type DialogEntry = {
+  id: string;
+  render: ({ hide }: { hide: () => void }) => React.ReactNode;
+} & Pick<DialogProps, 'title' | 'description' | 'hideX' | 'className' | 'size'>;
+
+type DialogEntryOptionalId = Omit<DialogEntry, 'id'> & { id?: string };
+
+interface State {
+  dialogs: DialogEntry[];
+  actions: Actions;
+}
+
+interface Actions {
+  show: (d: DialogEntryOptionalId) => void;
+  hide: (id: string) => void;
+}
+
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+const DialogContext = createContext<State>({} as any);
+
+export const DialogProvider = ({ children }: { children: React.ReactNode }) => {
+  const [dialogs, setDialogs] = useState<State['dialogs']>([]);
+  const actions = useMemo<Actions>(
+    () => ({
+      show: ({ id: oid, ...props }: DialogEntryOptionalId) => {
+        const id = oid ?? Math.random().toString(36).slice(2);
+        setDialogs((a) => [...a.filter((d) => d.id !== id), { id, ...props }]);
+      },
+      hide: (id: string) => {
+        setDialogs((a) => a.filter((d) => d.id !== id));
+      },
+    }),
+    [],
+  );
+
+  const state: State = {
+    dialogs,
+    actions,
+  };
+
+  return (
+    <DialogContext.Provider value={state}>
+      {children}
+      {dialogs.map((props: DialogEntry) => (
+        <DialogInstance key={props.id} {...props} />
+      ))}
+    </DialogContext.Provider>
+  );
+};
+
+function DialogInstance({ id, render, ...props }: DialogEntry) {
+  const { actions } = useContext(DialogContext);
+  const children = render({ hide: () => actions.hide(id) });
+  return (
+    <Dialog open onClose={() => actions.hide(id)} {...props}>
+      {children}
+    </Dialog>
+  );
+}
+
+export const useDialog = () => useContext(DialogContext).actions;

src-web/components/Divider.tsx

@@ -1,23 +0,0 @@
-import * as Separator from '@radix-ui/react-separator';
-import classnames from 'classnames';
-
-interface Props {
-  orientation?: 'horizontal' | 'vertical';
-  decorative?: boolean;
-  className?: string;
-}
-
-export function Divider({ className, orientation = 'horizontal', decorative }: Props) {
-  return (
-    <Separator.Root
-      className={classnames(
-        className,
-        'bg-gray-50',
-        orientation === 'horizontal' && 'w-full h-[1px]',
-        orientation === 'vertical' && 'h-full w-[1px]',
-      )}
-      orientation={orientation}
-      decorative={decorative}
-    />
-  );
-}

src-web/components/DropMarker.tsx

@@ -0,0 +1,22 @@
+import classNames from 'classnames';
+import React, { memo } from 'react';
+
+interface Props {
+  className?: string;
+}
+
+export const DropMarker = memo(
+  function DropMarker({ className }: Props) {
+    return (
+      <div
+        className={classNames(
+          className,
+          'relative w-full h-0 overflow-visible pointer-events-none',
+        )}
+      >
+        <div className="absolute z-50 left-2 right-2 -bottom-[0.1rem] h-[0.2rem] bg-blue-500/50 rounded-full" />
+      </div>
+    );
+  },
+  () => true,
+);

src-web/components/Dropdown.tsx

@@ -1,307 +0,0 @@
-import * as D from '@radix-ui/react-dropdown-menu';
-import { CheckIcon } from '@radix-ui/react-icons';
-import classnames from 'classnames';
-import { motion } from 'framer-motion';
-import type { ComponentChildren } from 'preact';
-import type { ForwardedRef } from 'preact/compat';
-import { forwardRef, useImperativeHandle, useLayoutEffect, useState } from 'react';
-
-interface DropdownMenuRadioProps {
-  children: ComponentChildren;
-  onValueChange: ((v: { label: string; value: string }) => void) | null;
-  value: string;
-  label?: string;
-  items: {
-    label: string;
-    value: string;
-  }[];
-}
-
-export function DropdownMenuRadio({
-  children,
-  items,
-  onValueChange,
-  label,
-  value,
-}: DropdownMenuRadioProps) {
-  const handleChange = (value: string) => {
-    const item = items.find((item) => item.value === value);
-    if (item && onValueChange) {
-      onValueChange(item);
-    }
-  };
-
-  return (
-    <D.Root>
-      <DropdownMenuTrigger>{children}</DropdownMenuTrigger>
-      <DropdownMenuPortal>
-        <DropdownMenuContent>
-          {label && <DropdownMenuLabel>{label}</DropdownMenuLabel>}
-          <D.DropdownMenuRadioGroup onValueChange={handleChange} value={value}>
-            {items.map((item) => (
-              <DropdownMenuRadioItem key={item.value} value={item.value}>
-                {item.label}
-              </DropdownMenuRadioItem>
-            ))}
-          </D.DropdownMenuRadioGroup>
-        </DropdownMenuContent>
-      </DropdownMenuPortal>
-    </D.Root>
-  );
-}
-
-export interface DropdownProps {
-  children: ComponentChildren;
-  items: (
-    | {
-        label: string;
-        onSelect?: () => void;
-        disabled?: boolean;
-        leftSlot?: ComponentChildren;
-      }
-    | '-----'
-  )[];
-}
-
-export function Dropdown({ children, items }: DropdownProps) {
-  return (
-    <D.Root>
-      <DropdownMenuTrigger>{children}</DropdownMenuTrigger>
-      <DropdownMenuPortal>
-        <DropdownMenuContent>
-          {items.map((item, i) => {
-            if (item === '-----') {
-              return <DropdownMenuSeparator key={i} />;
-            } else {
-              return (
-                <DropdownMenuItem
-                  key={i}
-                  onSelect={() => item.onSelect?.()}
-                  disabled={item.disabled}
-                  leftSlot={item.leftSlot}
-                >
-                  {item.label}
-                </DropdownMenuItem>
-              );
-            }
-          })}
-        </DropdownMenuContent>
-      </DropdownMenuPortal>
-    </D.Root>
-  );
-}
-
-interface DropdownMenuPortalProps {
-  children: ComponentChildren;
-}
-
-function DropdownMenuPortal({ children }: DropdownMenuPortalProps) {
-  const container = document.querySelector<Element>('#radix-portal');
-  if (container === null) return null;
-  return (
-    <D.Portal>
-      <motion.div initial={{ opacity: 0 }} animate={{ opacity: 1 }}>
-        {children}
-      </motion.div>
-    </D.Portal>
-  );
-}
-
-const DropdownMenuContent = forwardRef<HTMLDivElement, D.DropdownMenuContentProps>(
-  function DropdownMenuContent(
-    { className, children, ...props }: D.DropdownMenuContentProps,
-    ref: ForwardedRef<HTMLDivElement>,
-  ) {
-    const [styles, setStyles] = useState<{ maxHeight: number }>();
-    const [divRef, setDivRef] = useState<HTMLDivElement | null>(null);
-    useImperativeHandle<HTMLDivElement | null, HTMLDivElement | null>(ref, () => divRef);
-
-    const initDivRef = (ref: HTMLDivElement | null) => {
-      setDivRef(ref);
-    };
-
-    // Calculate the max height so we can scroll
-    useLayoutEffect(() => {
-      if (divRef === null) return;
-      // Needs to be in a setTimeout because the ref is not positioned yet
-      // TODO: Make this better?
-      setTimeout(() => {
-        const windowBox = document.documentElement.getBoundingClientRect();
-        const menuBox = divRef.getBoundingClientRect();
-        const styles = { maxHeight: windowBox.height - menuBox.top - 5 - 45 };
-        setStyles(styles);
-      });
-    }, [divRef]);
-
-    return (
-      <D.Content
-        ref={initDivRef}
-        align="start"
-        className={classnames(
-          className,
-          'bg-gray-50 rounded-md shadow-lg p-1.5 border border-gray-200',
-          'overflow-auto m-1',
-        )}
-        style={styles}
-        {...props}
-      >
-        {children}
-      </D.Content>
-    );
-  },
-);
-
-type DropdownMenuItemProps = D.DropdownMenuItemProps & ItemInnerProps;
-
-function DropdownMenuItem({
-  leftSlot,
-  rightSlot,
-  className,
-  children,
-  disabled,
-  ...props
-}: DropdownMenuItemProps) {
-  return (
-    <D.Item
-      asChild
-      disabled={disabled}
-      className={classnames(className, disabled && 'opacity-30')}
-      {...props}
-    >
-      <ItemInner leftSlot={leftSlot} rightSlot={rightSlot}>
-        {children}
-      </ItemInner>
-    </D.Item>
-  );
-}
-
-// type DropdownMenuCheckboxItemProps = DropdownMenu.DropdownMenuCheckboxItemProps & ItemInnerProps;
-//
-// function DropdownMenuCheckboxItem({
-//   leftSlot,
-//   rightSlot,
-//   children,
-//   ...props
-// }: DropdownMenuCheckboxItemProps) {
-//   return (
-//     <DropdownMenu.CheckboxItem asChild {...props}>
-//       <ItemInner leftSlot={leftSlot} rightSlot={rightSlot}>
-//         {children}
-//       </ItemInner>
-//     </DropdownMenu.CheckboxItem>
-//   );
-// }
-
-// type DropdownMenuSubTriggerProps = DropdownMenu.DropdownMenuSubTriggerProps & ItemInnerProps;
-//
-// function DropdownMenuSubTrigger({
-//   leftSlot,
-//   rightSlot,
-//   children,
-//   ...props
-// }: DropdownMenuSubTriggerProps) {
-//   return (
-//     <DropdownMenu.SubTrigger asChild {...props}>
-//       <ItemInner leftSlot={leftSlot} rightSlot={rightSlot}>
-//         {children}
-//       </ItemInner>
-//     </DropdownMenu.SubTrigger>
-//   );
-// }
-
-type DropdownMenuRadioItemProps = Omit<D.DropdownMenuRadioItemProps & ItemInnerProps, 'leftSlot'>;
-
-function DropdownMenuRadioItem({ rightSlot, children, ...props }: DropdownMenuRadioItemProps) {
-  return (
-    <D.RadioItem asChild {...props}>
-      <ItemInner
-        leftSlot={
-          <D.ItemIndicator>
-            <CheckIcon />
-          </D.ItemIndicator>
-        }
-        rightSlot={rightSlot}
-      >
-        {children}
-      </ItemInner>
-    </D.RadioItem>
-  );
-}
-
-// const DropdownMenuSubContent = forwardRef<HTMLDivElement, DropdownMenu.DropdownMenuSubContentProps>(
-//   function DropdownMenuSubContent(
-//     { className, ...props }: DropdownMenu.DropdownMenuSubContentProps,
-//     ref,
-//   ) {
-//     return (
-//       <DropdownMenu.SubContent
-//         ref={ref}
-//         alignOffset={0}
-//         sideOffset={4}
-//         className={classnames(className, dropdownMenuClasses)}
-//         {...props}
-//       />
-//     );
-//   },
-// );
-
-function DropdownMenuLabel({ className, children, ...props }: D.DropdownMenuLabelProps) {
-  return (
-    <D.Label asChild {...props}>
-      <ItemInner noHover className={classnames(className, 'opacity-50 uppercase text-sm')}>
-        {children}
-      </ItemInner>
-    </D.Label>
-  );
-}
-
-function DropdownMenuSeparator({ className, ...props }: D.DropdownMenuSeparatorProps) {
-  return (
-    <D.Separator
-      className={classnames(className, 'h-[1px] bg-gray-400 bg-opacity-30 my-1')}
-      {...props}
-    />
-  );
-}
-
-type DropdownMenuTriggerProps = D.DropdownMenuTriggerProps & {
-  children: ComponentChildren;
-  className?: string;
-};
-
-function DropdownMenuTrigger({ children, className, ...props }: DropdownMenuTriggerProps) {
-  return (
-    <D.Trigger asChild className={classnames(className)} {...props}>
-      {children}
-    </D.Trigger>
-  );
-}
-
-interface ItemInnerProps {
-  leftSlot?: ComponentChildren;
-  rightSlot?: ComponentChildren;
-  children: ComponentChildren;
-  noHover?: boolean;
-  className?: string;
-}
-
-const ItemInner = forwardRef<HTMLDivElement, ItemInnerProps>(function ItemInner(
-  { leftSlot, rightSlot, children, className, noHover, ...props }: ItemInnerProps,
-  ref,
-) {
-  return (
-    <div
-      ref={ref}
-      className={classnames(
-        className,
-        'outline-none px-2 py-1.5 flex items-center text-sm text-gray-700 whitespace-nowrap pr-4',
-        !noHover && 'focus:bg-gray-50 focus:text-gray-900 rounded',
-      )}
-      {...props}
-    >
-      {leftSlot && <div className="w-6">{leftSlot}</div>}
-      <div>{children}</div>
-      {rightSlot && <div className="ml-auto pl-3">{rightSlot}</div>}
-    </div>
-  );
-});

src-web/components/Editor/Editor.css

@@ -1,179 +0,0 @@
-.cm-wrapper {
-    @apply h-full overflow-hidden;
-
-    .cm-editor {
-        @apply w-full block text-base;
-
-        * {
-            @apply cursor-text;
-        }
-
-        &.cm-focused {
-            outline: none !important;
-        }
-
-        .cm-line {
-            @apply text-gray-900 pl-1 pr-1.5;
-        }
-
-        .cm-placeholder {
-            @apply text-placeholder;
-        }
-
-        /* Don't show selection on blurred input */
-        .cm-selectionBackground {
-            @apply bg-transparent;
-        }
-        &.cm-focused .cm-selectionBackground {
-            @apply bg-gray-400;
-        }
-
-        /* Style gutters */
-        .cm-gutters {
-            @apply border-0 text-gray-500/60;
-
-            .cm-gutterElement {
-                @apply cursor-default;
-            }
-        }
-
-        .placeholder-widget {
-            @apply text-[0.9em] text-gray-800 dark:text-gray-900 px-1 rounded cursor-default dark:shadow;
-
-            /* NOTE: Background and border are translucent so we can see text selection through it */
-            @apply bg-gray-300/40 border border-gray-300 border-opacity-40 hover:border-opacity-80;
-
-            /* Bring above on hover */
-            @apply hover:z-10 relative;
-        }
-    }
-
-    &.cm-singleline {
-        .cm-editor {
-            @apply h-full w-full;
-        }
-
-        .cm-scroller {
-            @apply font-mono flex text-[0.8rem];
-            align-items: center !important;
-            overflow: hidden !important;
-        }
-
-        .cm-line {
-            @apply px-0;
-        }
-    }
-
-    &.cm-multiline {
-        &.cm-full-height {
-            @apply relative;
-
-            .cm-editor {
-                @apply inset-0 absolute;
-                position: absolute !important;
-            }
-        }
-
-        .cm-editor {
-            @apply h-full;
-        }
-
-        .cm-scroller {
-            @apply font-mono text-[0.75rem];
-        }
-    }
-}
-
-.cm-editor .cm-gutterElement {
-    transition: color var(--transition-duration);
-}
-
-.cm-editor .fold-gutter-icon {
-    @apply pt-[0.3em] pl-[0.4em] px-[0.4em] h-4 cursor-pointer rounded;
-}
-
-.cm-editor .fold-gutter-icon::after {
-    @apply block w-1.5 h-1.5 border-transparent -rotate-45
-    border-l border-b border-l-[currentColor] border-b-[currentColor] content-[''];
-}
-
-.cm-editor .fold-gutter-icon[data-open] {
-    @apply pt-[0.4em] pl-[0.3em];
-}
-
-.cm-editor .fold-gutter-icon[data-open]::after {
-    @apply rotate-[-135deg];
-}
-
-.cm-editor .fold-gutter-icon:hover {
-    @apply text-gray-900 bg-gray-300/50;
-}
-
-.cm-editor .cm-foldPlaceholder {
-    @apply px-2 border border-gray-400/50 bg-gray-300/50 cursor-default;
-    @apply hover:text-gray-800 hover:border-gray-400;
-}
-
-.cm-editor .cm-activeLineGutter {
-    @apply bg-transparent;
-}
-
-.cm-wrapper:not(.cm-readonly) .cm-editor {
-    &.cm-focused .cm-activeLineGutter {
-        @apply text-gray-800;
-    }
-
-    .cm-cursor {
-        @apply border-l-2 border-gray-800;
-    }
-}
-
-.cm-singleline .cm-editor {
-    .cm-content {
-        @apply h-full flex items-center;
-    }
-}
-
-.cm-scroller, .cm-tooltip-autocomplete > ul {
-    &::-webkit-scrollbar-corner,
-    &::-webkit-scrollbar {
-        @apply w-1.5 h-1.5 bg-transparent;
-    }
-
-    &::-webkit-scrollbar-thumb {
-        @apply bg-gray-200 hover:bg-gray-300 rounded-full;
-    }
-}
-
-/* <-- */
-
-/* NOTE: Extra selector required to override default styles */
-.cm-tooltip.cm-tooltip {
-    @apply shadow-lg bg-gray-50 rounded overflow-hidden text-gray-900 border border-gray-200 z-50 pointer-events-auto;
-
-    * {
-        @apply transition-none;
-    }
-
-    &.cm-tooltip-autocomplete {
-        & > ul {
-            @apply p-1 max-h-[40vh];
-        }
-
-        & > ul > li {
-            @apply cursor-default px-2 rounded-sm text-gray-600 h-7 flex items-center;
-        }
-
-        & > ul > li[aria-selected] {
-            @apply bg-gray-100 text-gray-900;
-        }
-
-        & > ul > li:hover {
-            @apply text-gray-800;
-        }
-
-        .cm-completionIcon {
-            @apply text-sm flex items-center pb-0.5;
-        }
-    }
-}

src-web/components/Editor/Editor.tsx

@@ -1,185 +0,0 @@
-import { defaultKeymap } from '@codemirror/commands';
-import { Compartment, EditorState } from '@codemirror/state';
-import { keymap, placeholder as placeholderExt, tooltips } from '@codemirror/view';
-import classnames from 'classnames';
-import { EditorView } from 'codemirror';
-import { formatSdl } from 'format-graphql';
-import { useEffect, useRef } from 'react';
-import { useUnmount } from 'react-use';
-import { IconButton } from '../IconButton';
-import './Editor.css';
-import { baseExtensions, getLanguageExtension, multiLineExtensions } from './extensions';
-import { singleLineExt } from './singleLine';
-
-export interface _EditorProps {
-  id?: string;
-  readOnly?: boolean;
-  className?: string;
-  heightMode?: 'auto' | 'full';
-  contentType?: string;
-  autoFocus?: boolean;
-  defaultValue?: string;
-  placeholder?: string;
-  tooltipContainer?: HTMLElement;
-  useTemplating?: boolean;
-  onChange?: (value: string) => void;
-  singleLine?: boolean;
-}
-
-export function _Editor({
-  readOnly,
-  heightMode,
-  contentType,
-  autoFocus,
-  placeholder,
-  useTemplating,
-  defaultValue,
-  onChange,
-  className,
-  singleLine,
-}: _EditorProps) {
-  const cm = useRef<{ view: EditorView; langHolder: Compartment } | null>(null);
-
-  // Unmount the editor
-  useUnmount(() => {
-    cm.current?.view.destroy();
-    cm.current = null;
-  });
-
-  // Update language extension when contentType changes
-  useEffect(() => {
-    if (cm.current === null) return;
-    const { view, langHolder } = cm.current;
-    const ext = getLanguageExtension({ contentType, useTemplating });
-    view.dispatch({ effects: langHolder.reconfigure(ext) });
-  }, [contentType]);
-
-  // Initialize the editor
-  const initDivRef = (el: HTMLDivElement | null) => {
-    if (el === null || cm.current !== null) return;
-
-    try {
-      const langHolder = new Compartment();
-      const langExt = getLanguageExtension({ contentType, useTemplating });
-      const state = EditorState.create({
-        doc: `${defaultValue ?? ''}`,
-        extensions: [
-          langHolder.of(langExt),
-          ...getExtensions({
-            container: el,
-            readOnly,
-            placeholder,
-            singleLine,
-            onChange,
-            contentType,
-            useTemplating,
-          }),
-        ],
-      });
-      const view = new EditorView({ state, parent: el });
-      cm.current = { view, langHolder };
-      syncGutterBg({ parent: el, className });
-      if (autoFocus) view.focus();
-    } catch (e) {
-      console.log('Failed to initialize Codemirror', e);
-    }
-  };
-
-  return (
-    <div
-      ref={initDivRef}
-      className={classnames(
-        className,
-        'cm-wrapper text-base bg-gray-50',
-        heightMode === 'auto' ? 'cm-auto-height' : 'cm-full-height',
-        singleLine ? 'cm-singleline' : 'cm-multiline',
-        readOnly && 'cm-readonly',
-      )}
-    >
-      <IconButton
-        icon="eye"
-        className="absolute right-3 bottom-3 z-10"
-        onClick={() => {
-          const doc = cm.current?.view.state.doc ?? '';
-          const insert = formatSdl(doc.toString());
-          cm.current?.view.dispatch({ changes: { from: 0, to: doc.length, insert } });
-        }}
-      />
-    </div>
-  );
-}
-
-function getExtensions({
-  container,
-  readOnly,
-  singleLine,
-  placeholder,
-  onChange,
-  contentType,
-  useTemplating,
-}: Pick<
-  _EditorProps,
-  'singleLine' | 'onChange' | 'contentType' | 'useTemplating' | 'placeholder' | 'readOnly'
-> & { container: HTMLDivElement | null }) {
-  const ext = getLanguageExtension({ contentType, useTemplating });
-
-  // TODO: Ensure tooltips render inside the dialog if we are in one.
-  const parent =
-    container?.closest<HTMLDivElement>('[role="dialog"]') ??
-    document.querySelector<HTMLDivElement>('#cm-portal') ??
-    undefined;
-
-  return [
-    ...baseExtensions,
-    tooltips({ parent }),
-    keymap.of(singleLine ? defaultKeymap.filter((k) => k.key !== 'Enter') : defaultKeymap),
-    ...(singleLine ? [singleLineExt()] : []),
-    ...(!singleLine ? [multiLineExtensions] : []),
-    ...(ext ? [ext] : []),
-    ...(readOnly ? [EditorState.readOnly.of(true)] : []),
-    ...(placeholder ? [placeholderExt(placeholder)] : []),
-    ...(singleLine
-      ? [
-          EditorView.domEventHandlers({
-            focus: (e, view) => {
-              // select all text on focus, like a regular input does
-              view.dispatch({ selection: { anchor: 0, head: view.state.doc.length } });
-            },
-            keydown: (e) => {
-              // Submit nearest form on enter if there is one
-              if (e.key === 'Enter') {
-                const el = e.currentTarget as HTMLElement;
-                const form = el.closest('form');
-                form?.dispatchEvent(new Event('submit', { cancelable: true, bubbles: true }));
-              }
-            },
-          }),
-        ]
-      : []),
-
-    // Handle onChange
-    EditorView.updateListener.of((update) => {
-      if (typeof onChange === 'function' && update.docChanged) {
-        onChange(update.state.doc.toString());
-      }
-    }),
-  ];
-}
-
-const syncGutterBg = ({
-  parent,
-  className = '',
-}: {
-  parent: HTMLDivElement;
-  className?: string;
-}) => {
-  const gutterEl = parent.querySelector<HTMLDivElement>('.cm-gutters');
-  const classList = className?.split(/\s+/) ?? [];
-  const bgClasses = classList
-    .filter((c) => c.match(/(^|:)?bg-.+/)) // Find bg-* classes
-    .map((c) => c.replace(/^bg-/, '!bg-')) // !important
-    .map((c) => c.replace(/^dark:bg-/, 'dark:!bg-')); // !important
-  if (gutterEl) {
-    gutterEl?.classList.add(...bgClasses);
-  }
-};

src-web/components/Editor/index.tsx

@@ -1,6 +0,0 @@
-import { memo } from 'react';
-import { _Editor } from './Editor';
-import type { _EditorProps } from './Editor';
-
-export type EditorProps = _EditorProps;
-export const Editor = memo(_Editor);

src-web/components/Editor/twig/completion.ts

@@ -1,55 +0,0 @@
-import type { CompletionContext } from '@codemirror/autocomplete';
-
-const openTag = '${[ ';
-const closeTag = ' ]}';
-
-const variables = [
-  { name: 'DOMAIN' },
-  { name: 'BASE_URL' },
-  { name: 'TOKEN' },
-  { name: 'PROJECT_ID' },
-  { name: 'DUMMY' },
-  { name: 'DUMMY_2' },
-  { name: 'STRIPE_PUB_KEY' },
-  { name: 'RAILWAY_TOKEN' },
-  { name: 'SECRET' },
-  { name: 'PORT' },
-];
-
-const MIN_MATCH_VAR = 2;
-const MIN_MATCH_NAME = 4;
-
-export function completions(context: CompletionContext) {
-  const toStartOfName = context.matchBefore(/\w*/);
-  const toStartOfVariable = context.matchBefore(/\$\{?\[?\s*\w*/);
-  const toMatch = toStartOfVariable ?? toStartOfName ?? null;
-
-  if (toMatch === null) return null;
-
-  const matchLen = toMatch.to - toMatch.from;
-
-  const failedVarLen = toStartOfVariable !== null && matchLen < MIN_MATCH_VAR;
-  if (failedVarLen && !context.explicit) {
-    return null;
-  }
-
-  const failedNameLen = toStartOfVariable === null && matchLen < MIN_MATCH_NAME;
-  if (failedNameLen && !context.explicit) {
-    return null;
-  }
-
-  // TODO: Figure out how to make autocomplete stay open if opened explicitly. It sucks when you explicitly
-  //  open it, then it closes when you type the next character.
-  return {
-    from: toMatch.from,
-    options: variables
-      .map((v) => ({
-        label: toStartOfVariable ? `${openTag}${v.name}${closeTag}` : v.name,
-        apply: `${openTag}${v.name}${closeTag}`,
-        type: 'variable',
-        matchLen,
-      }))
-      // Filter out exact matches
-      .filter((o) => o.label !== toMatch.text),
-  };
-}

src-web/components/Editor/twig/extension.ts

@@ -1,41 +0,0 @@
-import { LanguageSupport, LRLanguage } from '@codemirror/language';
-import { parseMixed } from '@lezer/common';
-import { completions } from './completion';
-import { placeholders } from '../widgets';
-import { parser as twigParser } from './twig';
-
-export function twig(base?: LanguageSupport) {
-  const language = mixedOrPlainLanguage(base);
-  const completion = language.data.of({
-    autocomplete: completions,
-  });
-  const languageSupport = new LanguageSupport(language, [completion]);
-
-  if (base) {
-    const completion2 = base.language.data.of({ autocomplete: completions });
-    const languageSupport2 = new LanguageSupport(base.language, [completion2]);
-    return [languageSupport, languageSupport2, placeholders, base.support];
-  } else {
-    return [languageSupport, placeholders];
-  }
-}
-
-function mixedOrPlainLanguage(base?: LanguageSupport): LRLanguage {
-  const name = 'twig';
-
-  if (base == null) {
-    return LRLanguage.define({ name, parser: twigParser });
-  }
-
-  const parser = twigParser.configure({
-    wrap: parseMixed((node) => {
-      if (!node.type.isTop) return null;
-      return {
-        parser: base.language.parser,
-        overlay: (node) => node.type.name === 'Text',
-      };
-    }),
-  });
-
-  return LRLanguage.define({ name, parser });
-}

src-web/components/Editor/twig/twig.grammar

@@ -1,19 +0,0 @@
-@top Template { (directive | Text)* }
-
-directive {
-  Insert
-}
-
-@skip {space} {
-  Insert { "${[" DirectiveContent "]}" }
-}
-
-@tokens {
-  Text { ![$] Text? }
-  space { @whitespace+ }
-  DirectiveContent { ![\]}] DirectiveContent? }
-  @precedence { space DirectiveContent }
-  "${[" "]}"
-}
-
-@external propSource highlight from "./highlight"

src-web/components/Editor/twig/twig.ts

@@ -1,18 +0,0 @@
-// This file was generated by lezer-generator. You probably shouldn't edit it.
-import {LRParser} from "@lezer/lr"
-import {highlight} from "./highlight"
-export const parser = LRParser.deserialize({
-  version: 14,
-  states: "zQVOPOOO_QQO'#C^OOOO'#Cc'#CcQVOPOOOdQQO,58xOOOO-E6a-E6aOOOO1G.d1G.d",
-  stateData: "l~OYOS~ORPOUQO~OSSO~OTUO~OYS~",
-  goto: "cWPPXPPPP]TQORQRORTR",
-  nodeNames: "⚠ Template Insert ${[ DirectiveContent ]} Text",
-  maxTerm: 10,
-  propSources: [highlight],
-  skippedNodes: [0],
-  repeatNodeCount: 1,
-  tokenData: ")gRRmOX!|X^$y^p!|pq$yqt!|tu&}u#P!|#P#Q(k#Q#q!|#q#r$[#r#y!|#y#z$y#z$f!|$f$g$y$g#BY!|#BY#BZ$y#BZ$IS!|$IS$I_$y$I_$I|!|$I|$JO$y$JO$JT!|$JT$JU$y$JU$KV!|$KV$KW$y$KW&FU!|&FU&FV$y&FV;'S!|;'S;=`$s<%lO!|R#TXUPSQOt!|tu#pu#P!|#P#Q$[#Q#q!|#q#r$[#r;'S!|;'S;=`$s<%lO!|Q#uTSQO#P#p#Q#q#p#r;'S#p;'S;=`$U<%lO#pQ$XP;=`<%l#pP$aSUPOt$[u;'S$[;'S;=`$m<%lO$[P$pP;=`<%l$[R$vP;=`<%l!|R%SmUPYQSQOX!|X^$y^p!|pq$yqt!|tu#pu#P!|#P#Q$[#Q#q!|#q#r$[#r#y!|#y#z$y#z$f!|$f$g$y$g#BY!|#BY#BZ$y#BZ$IS!|$IS$I_$y$I_$I|!|$I|$JO$y$JO$JT!|$JT$JU$y$JU$KV!|$KV$KW$y$KW&FU!|&FU&FV$y&FV;'S!|;'S;=`$s<%lO!|R'SVSQO#P#p#Q#o#p#o#p'i#p#q#p#r;'S#p;'S;=`$U<%lO#pR'nVSQO!}#p!}#O(T#O#P#p#Q#q#p#r;'S#p;'S;=`$U<%lO#pR([TRPSQO#P#p#Q#q#p#r;'S#p;'S;=`$U<%lO#pR(pUUPOt$[u#q$[#q#r)S#r;'S$[;'S;=`$m<%lO$[R)ZSTQUPOt$[u;'S$[;'S;=`$m<%lO$[",
-  tokenizers: [0, 1],
-  topRules: {"Template":[0,1]},
-  tokenPrec: 25
-})

src-web/components/Editor/url/completion.ts

@@ -1,19 +0,0 @@
-import type { CompletionContext } from '@codemirror/autocomplete';
-
-const options = [
-  { label: 'http://', type: 'constant' },
-  { label: 'https://', type: 'constant' },
-];
-
-const MIN_MATCH = 1;
-
-export function completions(context: CompletionContext) {
-  const toMatch = context.matchBefore(/^[\w:/]*/);
-  if (toMatch === null) return null;
-
-  const matchedMinimumLength = toMatch.to - toMatch.from >= MIN_MATCH;
-  if (!matchedMinimumLength && !context.explicit) return null;
-
-  const optionsWithoutExactMatches = options.filter((o) => o.label !== toMatch.text);
-  return { from: toMatch.from, options: optionsWithoutExactMatches };
-}

src-web/components/Editor/widgets.ts

@@ -1,76 +0,0 @@
-import type { DecorationSet, ViewUpdate } from '@codemirror/view';
-import { Decoration, EditorView, MatchDecorator, ViewPlugin, WidgetType } from '@codemirror/view';
-
-class PlaceholderWidget extends WidgetType {
-  constructor(readonly name: string) {
-    super();
-  }
-  eq(other: PlaceholderWidget) {
-    return this.name == other.name;
-  }
-  toDOM() {
-    const elt = document.createElement('span');
-    elt.className = 'placeholder-widget';
-    elt.textContent = this.name;
-    return elt;
-  }
-  ignoreEvent() {
-    return false;
-  }
-}
-
-/**
- * This is a custom MatchDecorator that will not decorate a match if the selection is inside it
- */
-class BetterMatchDecorator extends MatchDecorator {
-  updateDeco(update: ViewUpdate, deco: DecorationSet): DecorationSet {
-    if (!update.startState.selection.eq(update.state.selection)) {
-      return super.createDeco(update.view);
-    } else {
-      return super.updateDeco(update, deco);
-    }
-  }
-}
-
-const placeholderMatcher = new BetterMatchDecorator({
-  regexp: /\$\{\[\s*([^\]\s]+)\s*]}/g,
-  decoration(match, view, matchStartPos) {
-    const matchEndPos = matchStartPos + match[0].length - 1;
-
-    // Don't decorate if the cursor is inside the match
-    for (const r of view.state.selection.ranges) {
-      if (r.from > matchStartPos && r.to <= matchEndPos) return null;
-    }
-
-    const groupMatch = match[1];
-    if (groupMatch == null) {
-      // Should never happen, but make TS happy
-      console.warn('Group match was empty', match);
-      return null;
-    }
-
-    return Decoration.replace({
-      inclusive: true,
-      widget: new PlaceholderWidget(groupMatch),
-    });
-  },
-});
-
-export const placeholders = ViewPlugin.fromClass(
-  class {
-    placeholders: DecorationSet;
-    constructor(view: EditorView) {
-      this.placeholders = placeholderMatcher.createDeco(view);
-    }
-    update(update: ViewUpdate) {
-      this.placeholders = placeholderMatcher.updateDeco(update, this.placeholders);
-    }
-  },
-  {
-    decorations: (instance) => instance.placeholders,
-    provide: (plugin) =>
-      EditorView.atomicRanges.of((view) => {
-        return view.plugin(plugin)?.placeholders || Decoration.none;
-      }),
-  },
-);

src-web/components/EmptyStateText.tsx

@@ -0,0 +1,13 @@
+import type { ReactNode } from 'react';
+
+interface Props {
+  children: ReactNode;
+}
+
+export function EmptyStateText({ children }: Props) {
+  return (
+    <div className="rounded-lg border border-dashed border-highlight h-full text-gray-400 flex items-center justify-center">
+      {children}
+    </div>
+  );
+}

src-web/components/EnvironmentActionsDropdown.tsx

@@ -0,0 +1,79 @@
+import classNames from 'classnames';
+import { memo, useCallback, useMemo } from 'react';
+import { useActiveEnvironment } from '../hooks/useActiveEnvironment';
+import { useAppRoutes } from '../hooks/useAppRoutes';
+import { useEnvironments } from '../hooks/useEnvironments';
+import type { ButtonProps } from './core/Button';
+import { Button } from './core/Button';
+import type { DropdownItem } from './core/Dropdown';
+import { Dropdown } from './core/Dropdown';
+import { Icon } from './core/Icon';
+import { useDialog } from './DialogContext';
+import { EnvironmentEditDialog } from './EnvironmentEditDialog';
+
+type Props = {
+  className?: string;
+} & Pick<ButtonProps, 'forDropdown' | 'leftSlot'>;
+
+export const EnvironmentActionsDropdown = memo(function EnvironmentActionsDropdown({
+  className,
+  ...buttonProps
+}: Props) {
+  const environments = useEnvironments();
+  const activeEnvironment = useActiveEnvironment();
+  const dialog = useDialog();
+  const routes = useAppRoutes();
+
+  const showEnvironmentDialog = useCallback(() => {
+    dialog.show({
+      title: 'Manage Environments',
+      render: () => <EnvironmentEditDialog initialEnvironment={activeEnvironment} />,
+    });
+  }, [dialog, activeEnvironment]);
+
+  const items: DropdownItem[] = useMemo(
+    () => [
+      ...environments.map(
+        (e) => ({
+          key: e.id,
+          label: e.name,
+          rightSlot: e.id === activeEnvironment?.id ? <Icon icon="check" /> : undefined,
+          onSelect: async () => {
+            if (e.id !== activeEnvironment?.id) {
+              routes.setEnvironment(e);
+            } else {
+              routes.setEnvironment(null);
+            }
+          },
+        }),
+        [activeEnvironment?.id],
+      ),
+      ...((environments.length > 0
+        ? [{ type: 'separator', label: 'Environments' }]
+        : []) as DropdownItem[]),
+      {
+        key: 'edit',
+        label: 'Manage Environments',
+        leftSlot: <Icon icon="gear" />,
+        onSelect: showEnvironmentDialog,
+      },
+    ],
+    [activeEnvironment, environments, routes, showEnvironmentDialog],
+  );
+
+  return (
+    <Dropdown items={items}>
+      <Button
+        size="sm"
+        className={classNames(
+          className,
+          'text-gray-800 !px-2 truncate',
+          activeEnvironment == null && 'text-opacity-disabled italic',
+        )}
+        {...buttonProps}
+      >
+        {activeEnvironment?.name ?? 'No Environment'}
+      </Button>
+    </Dropdown>
+  );
+});

src-web/components/EnvironmentEditDialog.tsx

@@ -0,0 +1,238 @@
+import classNames from 'classnames';
+import { useCallback, useMemo, useState } from 'react';
+import { useWindowSize } from 'react-use';
+import { useActiveWorkspace } from '../hooks/useActiveWorkspace';
+import { useCreateEnvironment } from '../hooks/useCreateEnvironment';
+import { useDeleteEnvironment } from '../hooks/useDeleteEnvironment';
+import { useEnvironments } from '../hooks/useEnvironments';
+import { usePrompt } from '../hooks/usePrompt';
+import { useUpdateEnvironment } from '../hooks/useUpdateEnvironment';
+import { useUpdateWorkspace } from '../hooks/useUpdateWorkspace';
+import type { Environment, Workspace } from '../lib/models';
+import { Button } from './core/Button';
+import type { DropdownItem } from './core/Dropdown';
+import { Dropdown } from './core/Dropdown';
+import type {
+  GenericCompletionConfig,
+  GenericCompletionOption,
+} from './core/Editor/genericCompletion';
+import { Icon } from './core/Icon';
+import { IconButton } from './core/IconButton';
+import { InlineCode } from './core/InlineCode';
+import type { PairEditorProps } from './core/PairEditor';
+import { PairEditor } from './core/PairEditor';
+import { HStack, VStack } from './core/Stacks';
+
+interface Props {
+  initialEnvironment: Environment | null;
+}
+
+export const EnvironmentEditDialog = function ({ initialEnvironment }: Props) {
+  const [selectedEnvironmentId, setSelectedEnvironmentId] = useState<string | null>(
+    initialEnvironment?.id ?? null,
+  );
+  const environments = useEnvironments();
+  const createEnvironment = useCreateEnvironment();
+  const activeWorkspace = useActiveWorkspace();
+
+  const windowSize = useWindowSize();
+  const showSidebar = windowSize.width > 500;
+
+  const selectedEnvironment = useMemo(
+    () => environments.find((e) => e.id === selectedEnvironmentId) ?? null,
+    [environments, selectedEnvironmentId],
+  );
+
+  return (
+    <div
+      className={classNames(
+        'h-full grid gap-x-8 grid-rows-[minmax(0,1fr)]',
+        showSidebar ? 'grid-cols-[auto_minmax(0,1fr)]' : 'grid-cols-[minmax(0,1fr)]',
+      )}
+    >
+      {showSidebar && (
+        <aside className="grid grid-rows-[minmax(0,1fr)_auto] gap-y-0.5 h-full max-w-[250px] pr-3 border-r border-gray-100 -ml-2">
+          <div className="min-w-0 h-full w-full overflow-y-scroll">
+            <SidebarButton
+              active={selectedEnvironment == null}
+              onClick={() => setSelectedEnvironmentId(null)}
+            >
+              Base Environment
+            </SidebarButton>
+            <div className="ml-3 pl-2 border-l border-highlight">
+              {environments.map((e) => (
+                <SidebarButton
+                  key={e.id}
+                  active={selectedEnvironment?.id === e.id}
+                  onClick={() => setSelectedEnvironmentId(e.id)}
+                >
+                  {e.name}
+                </SidebarButton>
+              ))}
+            </div>
+          </div>
+          <Button
+            size="sm"
+            className="w-full text-center"
+            color="gray"
+            justify="center"
+            onClick={() => createEnvironment.mutate()}
+          >
+            New Environment
+          </Button>
+        </aside>
+      )}
+      {activeWorkspace != null ? (
+        <EnvironmentEditor environment={selectedEnvironment} workspace={activeWorkspace} />
+      ) : (
+        <div className="flex w-full h-full items-center justify-center text-gray-400 italic">
+          select an environment
+        </div>
+      )}
+    </div>
+  );
+};
+
+const EnvironmentEditor = function ({
+  environment,
+  workspace,
+}: {
+  environment: Environment | null;
+  workspace: Workspace;
+}) {
+  const environments = useEnvironments();
+  const updateEnvironment = useUpdateEnvironment(environment?.id ?? 'n/a');
+  const updateWorkspace = useUpdateWorkspace(workspace.id);
+  const deleteEnvironment = useDeleteEnvironment(environment);
+  const variables = environment == null ? workspace.variables : environment.variables;
+  const handleChange = useCallback<PairEditorProps['onChange']>(
+    (variables) => {
+      if (environment != null) {
+        updateEnvironment.mutate({ variables });
+      } else {
+        updateWorkspace.mutate({ variables });
+      }
+    },
+    [updateWorkspace, updateEnvironment, environment],
+  );
+
+  // Gather a list of env names from other environments, to help the user get them aligned
+  const nameAutocomplete = useMemo<GenericCompletionConfig>(() => {
+    const otherEnvironments = environments.filter((e) => e.id !== environment?.id);
+    const allVariableNames =
+      environment == null
+        ? [
+            // Nothing to autocomplete if we're in the base environment
+          ]
+        : [
+            ...workspace.variables.map((v) => v.name),
+            ...otherEnvironments.flatMap((e) => e.variables.map((v) => v.name)),
+          ];
+
+    // Filter out empty strings and variables that already exist
+    const variableNames = allVariableNames.filter(
+      (name) => name != '' && !variables.find((v) => v.name === name),
+    );
+    const uniqueVariableNames = [...new Set(variableNames)];
+    const options = uniqueVariableNames.map(
+      (name): GenericCompletionOption => ({
+        label: name,
+        type: 'constant',
+      }),
+    );
+    return { options };
+  }, [environments, variables, workspace, environment]);
+
+  const prompt = usePrompt();
+  const items = useMemo<DropdownItem[] | null>(
+    () =>
+      environment == null
+        ? null
+        : [
+            {
+              key: 'rename',
+              label: 'Rename',
+              leftSlot: <Icon icon="pencil" size="sm" />,
+              onSelect: async () => {
+                const name = await prompt({
+                  title: 'Rename Environment',
+                  description: (
+                    <>
+                      Enter a new name for <InlineCode>{environment.name}</InlineCode>
+                    </>
+                  ),
+                  name: 'name',
+                  label: 'Name',
+                  defaultValue: environment.name,
+                });
+                updateEnvironment.mutate({ name });
+              },
+            },
+            {
+              key: 'delete',
+              variant: 'danger',
+              label: 'Delete',
+              leftSlot: <Icon icon="trash" size="sm" />,
+              onSelect: () => deleteEnvironment.mutate(),
+            },
+          ],
+    [deleteEnvironment, updateEnvironment, prompt, environment],
+  );
+
+  const validateName = useCallback((name: string) => {
+    // Empty just means the variable doesn't have a name yet, and is unusable
+    if (name === '') return true;
+    return name.match(/^[a-z_][a-z0-9_]*$/i) != null;
+  }, []);
+
+  return (
+    <VStack space={2}>
+      <HStack space={2} className="justify-between">
+        <h1 className="text-xl">{environment?.name ?? 'Base Environment'}</h1>
+        {items != null && (
+          <Dropdown items={items}>
+            <IconButton icon="gear" title="Environment Actions" size="sm" className="!h-auto w-8" />
+          </Dropdown>
+        )}
+      </HStack>
+      <PairEditor
+        nameAutocomplete={nameAutocomplete}
+        nameAutocompleteVariables={false}
+        namePlaceholder="VAR_NAME"
+        valuePlaceholder="variable value"
+        nameValidate={validateName}
+        valueAutocompleteVariables={false}
+        forceUpdateKey={environment?.id ?? workspace?.id ?? 'n/a'}
+        pairs={variables}
+        onChange={handleChange}
+      />
+    </VStack>
+  );
+};
+
+function SidebarButton({
+  children,
+  className,
+  active,
+  onClick,
+}: {
+  className?: string;
+  children: string;
+  active: boolean;
+  onClick: () => void;
+}) {
+  return (
+    <button
+      tabIndex={active ? 0 : -1}
+      onClick={onClick}
+      className={classNames(
+        className,
+        'flex items-center text-sm text-left w-full mb-1 h-xs rounded px-2',
+        'text-gray-600 hocus:text-gray-800 focus:bg-highlightSecondary outline-none',
+        active && '!text-gray-900',
+      )}
+    >
+      {children}
+    </button>
+  );
+}

src-web/components/GlobalHooks.tsx

@@ -0,0 +1,143 @@
+import { useQueryClient } from '@tanstack/react-query';
+import { appWindow } from '@tauri-apps/api/window';
+import { useEffect } from 'react';
+import { useLocation } from 'react-router-dom';
+import { useEffectOnce } from 'react-use';
+import { keyValueQueryKey } from '../hooks/useKeyValue';
+import { useListenToTauriEvent } from '../hooks/useListenToTauriEvent';
+import { useRecentEnvironments } from '../hooks/useRecentEnvironments';
+import { useRecentRequests } from '../hooks/useRecentRequests';
+import { useRecentWorkspaces } from '../hooks/useRecentWorkspaces';
+import { requestsQueryKey } from '../hooks/useRequests';
+import { useRequestUpdateKey } from '../hooks/useRequestUpdateKey';
+import { responsesQueryKey } from '../hooks/useResponses';
+import { workspacesQueryKey } from '../hooks/useWorkspaces';
+import { trackPage } from '../lib/analytics';
+import { DEFAULT_FONT_SIZE } from '../lib/constants';
+import { NAMESPACE_NO_SYNC } from '../lib/keyValueStore';
+import type { HttpRequest, HttpResponse, Model, Workspace } from '../lib/models';
+import { modelsEq } from '../lib/models';
+import { setPathname } from '../lib/persistPathname';
+
+export function GlobalHooks() {
+  // Include here so they always update, even
+  // if no component references them
+  useRecentWorkspaces();
+  useRecentEnvironments();
+  useRecentRequests();
+
+  const queryClient = useQueryClient();
+  const { wasUpdatedExternally } = useRequestUpdateKey(null);
+
+  // Listen for location changes and update the pathname
+  const location = useLocation();
+  useEffect(() => {
+    setPathname(location.pathname).catch(console.error);
+  }, [location.pathname]);
+
+  useEffectOnce(() => {
+    trackPage('/');
+  });
+
+  useListenToTauriEvent<Model>('created_model', ({ payload, windowLabel }) => {
+    if (shouldIgnoreEvent(payload, windowLabel)) return;
+
+    const queryKey =
+      payload.model === 'http_request'
+        ? requestsQueryKey(payload)
+        : payload.model === 'http_response'
+        ? responsesQueryKey(payload)
+        : payload.model === 'workspace'
+        ? workspacesQueryKey(payload)
+        : payload.model === 'key_value'
+        ? keyValueQueryKey(payload)
+        : null;
+
+    if (queryKey === null) {
+      console.log('Unrecognized created model:', payload);
+      return;
+    }
+
+    if (!shouldIgnoreModel(payload)) {
+      // Order newest first
+      queryClient.setQueryData<Model[]>(queryKey, (values) => [payload, ...(values ?? [])]);
+    }
+  });
+
+  useListenToTauriEvent<Model>('updated_model', ({ payload, windowLabel }) => {
+    if (shouldIgnoreEvent(payload, windowLabel)) return;
+
+    const queryKey =
+      payload.model === 'http_request'
+        ? requestsQueryKey(payload)
+        : payload.model === 'http_response'
+        ? responsesQueryKey(payload)
+        : payload.model === 'workspace'
+        ? workspacesQueryKey(payload)
+        : payload.model === 'key_value'
+        ? keyValueQueryKey(payload)
+        : null;
+
+    if (queryKey === null) {
+      console.log('Unrecognized updated model:', payload);
+      return;
+    }
+
+    if (payload.model === 'http_request') {
+      wasUpdatedExternally(payload.id);
+    }
+
+    if (!shouldIgnoreModel(payload)) {
+      queryClient.setQueryData<Model[]>(queryKey, (values) =>
+        values?.map((v) => (modelsEq(v, payload) ? payload : v)),
+      );
+    }
+  });
+
+  useListenToTauriEvent<Model>('deleted_model', ({ payload, windowLabel }) => {
+    if (shouldIgnoreEvent(payload, windowLabel)) return;
+
+    if (shouldIgnoreModel(payload)) return;
+
+    if (payload.model === 'workspace') {
+      queryClient.setQueryData<Workspace[]>(workspacesQueryKey(), removeById(payload));
+    } else if (payload.model === 'http_request') {
+      queryClient.setQueryData<HttpRequest[]>(requestsQueryKey(payload), removeById(payload));
+    } else if (payload.model === 'http_response') {
+      queryClient.setQueryData<HttpResponse[]>(responsesQueryKey(payload), removeById(payload));
+    } else if (payload.model === 'key_value') {
+      queryClient.setQueryData(keyValueQueryKey(payload), undefined);
+    }
+  });
+  useListenToTauriEvent<number>('zoom', ({ payload: zoomDelta, windowLabel }) => {
+    if (windowLabel !== appWindow.label) return;
+    const fontSize = parseFloat(window.getComputedStyle(document.documentElement).fontSize);
+
+    let newFontSize;
+    if (zoomDelta === 0) {
+      newFontSize = DEFAULT_FONT_SIZE;
+    } else if (zoomDelta > 0) {
+      newFontSize = Math.min(fontSize * 1.1, DEFAULT_FONT_SIZE * 5);
+    } else if (zoomDelta < 0) {
+      newFontSize = Math.max(fontSize * 0.9, DEFAULT_FONT_SIZE * 0.4);
+    }
+
+    document.documentElement.style.fontSize = `${newFontSize}px`;
+  });
+
+  return null;
+}
+
+function removeById<T extends { id: string }>(model: T) {
+  return (entries: T[] | undefined) => entries?.filter((e) => e.id !== model.id);
+}
+
+const shouldIgnoreEvent = (payload: Model, windowLabel: string) =>
+  windowLabel === appWindow.label && payload.model !== 'http_response';
+
+const shouldIgnoreModel = (payload: Model) => {
+  if (payload.model === 'key_value') {
+    return payload.namespace === NAMESPACE_NO_SYNC;
+  }
+  return false;
+};

src-web/components/GraphQLEditor.tsx

@@ -0,0 +1,135 @@
+import { updateSchema } from 'cm6-graphql';
+import type { EditorView } from 'codemirror';
+import { useCallback, useEffect, useMemo, useRef } from 'react';
+import { useIntrospectGraphQL } from '../hooks/useIntrospectGraphQL';
+import type { HttpRequest } from '../lib/models';
+import { Button } from './core/Button';
+import type { EditorProps } from './core/Editor';
+import { Editor, formatGraphQL } from './core/Editor';
+import { FormattedError } from './core/FormattedError';
+import { Separator } from './core/Separator';
+import { useDialog } from './DialogContext';
+
+type Props = Pick<
+  EditorProps,
+  'heightMode' | 'onChange' | 'defaultValue' | 'className' | 'forceUpdateKey'
+> & {
+  baseRequest: HttpRequest;
+};
+
+interface GraphQLBody {
+  query: string;
+  variables?: Record<string, string | number | boolean | null>;
+  operationName?: string;
+}
+
+export function GraphQLEditor({ defaultValue, onChange, baseRequest, ...extraEditorProps }: Props) {
+  const editorViewRef = useRef<EditorView>(null);
+  const { schema, isLoading, error, refetch } = useIntrospectGraphQL(baseRequest);
+  const { query, variables } = useMemo<GraphQLBody>(() => {
+    if (defaultValue === undefined) {
+      return { query: '', variables: {} };
+    }
+    try {
+      const p = JSON.parse(defaultValue ?? '{}');
+      const query = p.query ?? '';
+      const variables = p.variables;
+      const operationName = p.operationName;
+      return { query, variables, operationName };
+    } catch (err) {
+      return { query: 'failed to parse' };
+    }
+  }, [defaultValue]);
+
+  const handleChange = useCallback(
+    (b: GraphQLBody) => onChange?.(JSON.stringify(b, null, 2)),
+    [onChange],
+  );
+
+  const handleChangeQuery = useCallback(
+    (query: string) => handleChange({ query, variables }),
+    [handleChange, variables],
+  );
+
+  const handleChangeVariables = useCallback(
+    (variables: string) => {
+      try {
+        handleChange({ query, variables: JSON.parse(variables) });
+      } catch (e) {
+        // Meh, not much we can do here
+      }
+    },
+    [handleChange, query],
+  );
+
+  // Refetch the schema when the URL changes
+  useEffect(() => {
+    if (editorViewRef.current === null) return;
+    updateSchema(editorViewRef.current, schema);
+  }, [schema]);
+
+  const dialog = useDialog();
+
+  return (
+    <div className="pb-2 h-full w-full grid grid-cols-1 grid-rows-[minmax(0,100%)_auto_auto_minmax(0,auto)]">
+      <Editor
+        contentType="application/graphql"
+        defaultValue={query ?? ''}
+        format={formatGraphQL}
+        heightMode="auto"
+        onChange={handleChangeQuery}
+        placeholder="..."
+        ref={editorViewRef}
+        actions={
+          (error || isLoading) && (
+            <Button
+              size="xs"
+              color={error ? 'danger' : 'gray'}
+              isLoading={isLoading}
+              onClick={() => {
+                dialog.show({
+                  title: 'Introspection Failed',
+                  size: 'sm',
+                  id: 'introspection-failed',
+                  render: () => (
+                    <div className="whitespace-pre-wrap">
+                      <FormattedError>{error ?? 'unknown'}</FormattedError>
+                      <div className="w-full mt-3">
+                        <Button
+                          onClick={() => {
+                            dialog.hide('introspection-failed');
+                            refetch();
+                          }}
+                          className="ml-auto"
+                          color="secondary"
+                          size="sm"
+                        >
+                          Try Again
+                        </Button>
+                      </div>
+                    </div>
+                  ),
+                });
+              }}
+            >
+              {error ? 'Introspection Failed' : 'Introspecting'}
+            </Button>
+          )
+        }
+        {...extraEditorProps}
+      />
+      <Separator variant="primary" />
+      <p className="pt-1 text-gray-500 text-sm">Variables</p>
+      <Editor
+        contentType="application/json"
+        defaultValue={JSON.stringify(variables, null, 2)}
+        heightMode="auto"
+        onChange={handleChangeVariables}
+        placeholder="{}"
+        useTemplating
+        autocompleteVariables
+        {...extraEditorProps}
+      />
+    </div>
+  );
+}

src-web/components/Grid.tsx

@@ -1,48 +0,0 @@
-import classnames from 'classnames';
-import type { ComponentChildren } from 'preact';
-
-const colsClasses: Record<string | number, string> = {
-  none: 'grid-cols-none',
-  1: 'grid-cols-1',
-  2: 'grid-cols-2',
-  3: 'grid-cols-3',
-  11: 'grid-cols-11',
-};
-
-const rowsClasses = {
-  none: 'grid-rows-none',
-  1: 'grid-rows-1',
-  2: 'grid-rows-2',
-  3: 'grid-rows-3',
-  11: 'grid-rows-11',
-};
-
-const gapClasses = {
-  0: 'gap-0',
-  1: 'gap-1',
-  2: 'gap-2',
-  3: 'gap-3',
-};
-
-interface Props {
-  rows?: keyof typeof rowsClasses;
-  cols?: keyof typeof colsClasses;
-  gap?: keyof typeof gapClasses;
-  className?: string;
-  children?: ComponentChildren;
-}
-
-export function Grid({ className, cols, gap, children }: Props) {
-  return (
-    <div
-      className={classnames(
-        className,
-        'grid w-full',
-        cols && colsClasses[cols],
-        gap && gapClasses[gap],
-      )}
-    >
-      {children}
-    </div>
-  );
-}

src-web/components/HeaderEditor.tsx

@@ -1,121 +1,71 @@
-import { useCallback, useEffect, useState } from 'react';
-import { useRequestUpdate } from '../hooks/useRequest';
-import type { HttpHeader, HttpRequest } from '../lib/models';
-import { IconButton } from './IconButton';
-import { Input } from './Input';
-import { VStack } from './Stacks';
+import { charsets } from '../lib/data/charsets';
+import { connections } from '../lib/data/connections';
+import { encodings } from '../lib/data/encodings';
+import { headerNames } from '../lib/data/headerNames';
+import { mimeTypes } from '../lib/data/mimetypes';
+import type { HttpRequest } from '../lib/models';
+import type { GenericCompletionConfig } from './core/Editor/genericCompletion';
+import type { PairEditorProps } from './core/PairEditor';
+import { PairEditor } from './core/PairEditor';
 
-interface Props {
-  request: HttpRequest;
-}
-
-type PairWithId = { header: Partial<HttpHeader>; id: string };
-
-export function HeaderEditor({ request }: Props) {
-  const updateRequest = useRequestUpdate(request);
-  const saveHeaders = useCallback(
-    (pairs: PairWithId[]) => {
-      const headers = pairs.map((p) => ({ name: '', value: '', ...p.header }));
-      updateRequest.mutate({ headers });
-    },
-    [updateRequest],
-  );
-
-  const newPair = () => {
-    return { header: { name: '', value: '' }, id: Math.random().toString() };
-  };
-
-  const [pairs, setPairs] = useState<PairWithId[]>(
-    request.headers.map((h) => ({ header: h, id: Math.random().toString() })),
-  );
-
-  const setPairsAndSave = useCallback(
-    (fn: (pairs: PairWithId[]) => PairWithId[]) => {
-      setPairs((oldPairs) => {
-        const newPairs = fn(oldPairs);
-        saveHeaders(newPairs);
-        return newPairs;
-      });
-    },
-    [saveHeaders],
-  );
-
-  const handleChangeHeader = (pair: PairWithId) => {
-    setPairsAndSave((pairs) =>
-      pairs.map((p) =>
-        pair.id !== p.id ? p : { id: p.id, header: { ...p.header, ...pair.header } },
-      ),
-    );
-  };
-
-  useEffect(() => {
-    const lastPair = pairs[pairs.length - 1];
-    if (lastPair === undefined) {
-      setPairs([newPair()]);
-      return;
-    }
-
-    if (lastPair.header.name !== '' || lastPair.header.value !== '') {
-      setPairsAndSave((pairs) => [...pairs, newPair()]);
-    }
-  }, [pairs, setPairsAndSave]);
-
-  const handleDelete = (pair: PairWithId) => {
-    setPairsAndSave((oldPairs) => oldPairs.filter((p) => p.id !== pair.id));
-  };
+type Props = {
+  forceUpdateKey: string;
+  headers: HttpRequest['headers'];
+  onChange: (headers: HttpRequest['headers']) => void;
+};
 
+export function HeaderEditor({ headers, onChange, forceUpdateKey }: Props) {
   return (
-    <div className="pb-6">
-      <VStack space={2}>
-        {pairs.map((p, i) => (
-          <FormRow
-            key={p.id}
-            pair={p}
-            onChange={handleChangeHeader}
-            onDelete={i < pairs.length - 1 ? handleDelete : undefined}
-          />
-        ))}
-      </VStack>
-    </div>
+    <PairEditor
+      valueAutocompleteVariables
+      nameAutocompleteVariables
+      pairs={headers}
+      onChange={onChange}
+      forceUpdateKey={forceUpdateKey}
+      nameValidate={validateHttpHeader}
+      nameAutocomplete={nameAutocomplete}
+      valueAutocomplete={valueAutocomplete}
+      namePlaceholder="Header-Name"
+    />
   );
 }
 
-function FormRow({
-  pair,
-  onChange,
-  onDelete,
-}: {
-  pair: PairWithId;
-  onChange: (pair: PairWithId) => void;
-  onDelete?: (pair: PairWithId) => void;
-}) {
-  return (
-    <div className="group grid grid-cols-[1fr_1fr_2.5rem] grid-rows-1 gap-2 items-center">
-      <Input
-        hideLabel
-        useEditor={{ useTemplating: true }}
-        name="name"
-        label="Name"
-        placeholder="name"
-        defaultValue={pair.header.name}
-        onChange={(name) => onChange({ id: pair.id, header: { name } })}
-      />
-      <Input
-        hideLabel
-        name="value"
-        label="Value"
-        useEditor={{ useTemplating: true }}
-        placeholder="value"
-        defaultValue={pair.header.value}
-        onChange={(value) => onChange({ id: pair.id, header: { value } })}
-      />
-      {onDelete && (
-        <IconButton
-          icon="trash"
-          onClick={() => onDelete(pair)}
-          className="invisible group-hover:visible"
-        />
-      )}
-    </div>
-  );
-}
+const MIN_MATCH = 3;
+
+const headerOptionsMap: Record<string, string[]> = {
+  'content-type': mimeTypes,
+  accept: ['*/*', ...mimeTypes],
+  'accept-encoding': encodings,
+  connection: connections,
+  'accept-charset': charsets,
+};
+
+const valueAutocomplete = (headerName: string): GenericCompletionConfig | undefined => {
+  const name = headerName.toLowerCase().trim();
+  const options: GenericCompletionConfig['options'] =
+    headerOptionsMap[name]?.map((o) => ({
+      label: o,
+      type: 'constant',
+      boost: 1, // Put above other completions
+    })) ?? [];
+  return { minMatch: MIN_MATCH, options };
+};
+
+const nameAutocomplete: PairEditorProps['nameAutocomplete'] = {
+  minMatch: MIN_MATCH,
+  options: headerNames.map((t) => ({
+    label: t,
+    type: 'constant',
+    boost: 1, // Put above other completions
+  })),
+};
+
+const validateHttpHeader = (v: string) => {
+  if (v === '') {
+    return true;
+  }
+
+  // Template strings are not allowed so we replace them with a valid example string
+  const withoutTemplateStrings = v.replace(/\$\{\[\s*[^\]\s]+\s*]}/gi, '123');
+  return withoutTemplateStrings.match(/^[a-zA-Z0-9-_]+$/) !== null;
+};

src-web/components/Heading.tsx

@@ -1,15 +0,0 @@
-import classnames from 'classnames';
-import type { ComponentChildren } from 'preact';
-
-type Props = {
-  className?: string;
-  children?: ComponentChildren;
-};
-
-export function Heading({ className, children, ...props }: Props) {
-  return (
-    <h1 className={classnames(className, 'text-2xl font-semibold text-gray-900 mb-3')} {...props}>
-      {children}
-    </h1>
-  );
-}