diff --git a/apps/tauri/package.json b/apps/tauri/package.json
index 0fed140c..77a32238 100644
--- a/apps/tauri/package.json
+++ b/apps/tauri/package.json
@@ -11,9 +11,15 @@
"typecheck": "vue-tsc --noEmit"
},
"dependencies": {
+ "@codemirror/commands": "^6.11.1",
+ "@codemirror/lang-sql": "^6.10.0",
+ "@codemirror/language": "^6.13.1",
+ "@codemirror/state": "^6.7.6",
+ "@codemirror/view": "^6.43.15",
"@tauri-apps/api": "^2",
"@tauri-apps/plugin-dialog": "^2.8.4",
"@tauri-apps/plugin-opener": "^2",
+ "codemirror": "^6.0.2",
"pinia": "^3.0.3",
"vue": "^3.5.13"
},
diff --git a/apps/tauri/pnpm-lock.yaml b/apps/tauri/pnpm-lock.yaml
index b3cf45c3..5df39e89 100644
--- a/apps/tauri/pnpm-lock.yaml
+++ b/apps/tauri/pnpm-lock.yaml
@@ -8,6 +8,21 @@ importers:
.:
dependencies:
+ '@codemirror/commands':
+ specifier: ^6.11.1
+ version: 6.11.1
+ '@codemirror/lang-sql':
+ specifier: ^6.10.0
+ version: 6.10.0
+ '@codemirror/language':
+ specifier: ^6.13.1
+ version: 6.13.1
+ '@codemirror/state':
+ specifier: ^6.7.6
+ version: 6.7.6
+ '@codemirror/view':
+ specifier: ^6.43.15
+ version: 6.43.15
'@tauri-apps/api':
specifier: ^2
version: 2.12.4
@@ -17,6 +32,9 @@ importers:
'@tauri-apps/plugin-opener':
specifier: ^2
version: 2.7.3
+ codemirror:
+ specifier: ^6.0.2
+ version: 6.0.2
pinia:
specifier: ^3.0.3
version: 3.0.4(typescript@5.8.3)(vue@3.5.45(typescript@5.8.3))
@@ -59,6 +77,33 @@ packages:
resolution: {integrity: sha512-UjI/dKmwJwT9pOszJitq2G6EObZPnsZUfdCr92z2TlF3EZK9J3EdfOKUrCzHl6wFthbzwhzl1Soc/UIwxRiq6w==}
engines: {node: '>=6.9.0'}
+ '@codemirror/autocomplete@6.20.4':
+ resolution: {integrity: sha512-yF8RhOf2SXlg00+qtupzLhrglcas61boqaONiNcbPIebHCpJocpqTBA6dyrtUrQO47hqyTdeob/3XnYilT7TaQ==}
+
+ '@codemirror/commands@6.11.1':
+ resolution: {integrity: sha512-O/4hG3SC1YwcmQ0d2UVNDs+AsaNWd1iHVxbTeEBuqH+6bExAiPK3iS/BvpY6rZGURALv4ZD3sIgcCmRvw3ehBg==}
+
+ '@codemirror/lang-sql@6.10.0':
+ resolution: {integrity: sha512-6ayPkEd/yRw0XKBx5uAiToSgGECo/GY2NoJIHXIIQh1EVwLuKoU8BP/qK0qH5NLXAbtJRLuT73hx7P9X34iO4w==}
+
+ '@codemirror/language@6.13.1':
+ resolution: {integrity: sha512-zfvU2r3TyylQLMj/te+5CnQ0rSqZi8B1oTCBbQkagcLW4Xc6imab6qN+pEJhsuNOLaJqiRyBXp9UhWA1DhVvDw==}
+
+ '@codemirror/lint@6.9.8':
+ resolution: {integrity: sha512-qNvtcE73xUto/D1RvtgSRI4A1Hg8ekxlvtZpjHpdpisLBnhyu82EUEJMEgaxkjuQCA8vqnrylENWKOsEDCOHcw==}
+
+ '@codemirror/search@6.7.2':
+ resolution: {integrity: sha512-gUYkYhT2+n/+VGZ+8EzE5WFkYZUZYm1VOKDudIsNqh42uRVQJ0a6Yss9sdKT3MeOYfuL1N6AZA57oza0Oyr0LA==}
+
+ '@codemirror/state@6.7.6':
+ resolution: {integrity: sha512-kAz+AncRtKuIknedxT1bq4XwXv4UowhbkHU1myPrtVb/jZtImWuV5BXzv5vK6i3kYACsdiZiQKFQQ5Mq7elW8w==}
+
+ '@codemirror/streamparser@6.0.0':
+ resolution: {integrity: sha512-JTFPF6xrfjt0mnfGPgzcLiMwYmvIyNaoizp8BYzv8FE8KrT6GBGDZ190rtt+O7Wke3gG/MFHyiY9YGNeimof4w==}
+
+ '@codemirror/view@6.43.15':
+ resolution: {integrity: sha512-HHsfpqFeHyXLs983pSRe38Xajs0vFWZQ2BuX0m7Ki8w3jZ5iD8cuR3lBz2/5/X53Dhf32SBHKh6rtSTB6tKeGw==}
+
'@esbuild/aix-ppc64@0.25.12':
resolution: {integrity: sha512-Hhmwd6CInZ3dwpuGTF8fJG6yoWmsToE+vYgD4nytZVxcu1ulHpUQRAB1UJ8+N1Am3Mz4+xOByoQoSZf4D+CpkA==}
engines: {node: '>=18'}
@@ -218,6 +263,18 @@ packages:
'@jridgewell/sourcemap-codec@1.6.0':
resolution: {integrity: sha512-T7jf+5zgsZHwNJ4lvQ7/aezbyk0nNX+zJVWpmHA7VYsEx7a7qr5Rg5IbtJFqkgze5Y2sruq1RUY8Q837Od7iFw==}
+ '@lezer/common@1.5.5':
+ resolution: {integrity: sha512-Pw7PVCndruF1pb3ebCxpSVpkMHSDjwRCLcTRw+RizUKco5QbWylwq2g4lnG/RYN7yTTQDXE9F77MwtkAyphrjg==}
+
+ '@lezer/highlight@1.2.5':
+ resolution: {integrity: sha512-O1GMVKgtf5YspFaRzpmqkVgMtIk2HG9uMAbH6wdAIdNh3TVzCsch/+cRi+6l2//UGDKe6NB9BW3cvuR5ezMQ0w==}
+
+ '@lezer/lr@1.4.12':
+ resolution: {integrity: sha512-On9HU4oMMiHPMkQDgoTnGahjgG5n/MkN38CgG77sMraKLL+3JBbeQNi1FcCXV9QRqwF9/BUXP3caHyJC1fBOTQ==}
+
+ '@marijn/find-cluster-break@1.0.4':
+ resolution: {integrity: sha512-Wy0V7+SGUjnF9/TkiM1hKVDPj7jKXduPNboMVtHTA8dySMURWqfg/JZ9E2Sq8JgSJmkl7k7Qe9FLeMSrSraWmQ==}
+
'@rolldown/pluginutils@1.1.0':
resolution: {integrity: sha512-K+NU2HDCEem4sClgHH4ZZXwdJeNFkJo+hRk479DIwdIviAPN2hFJH1KHHwg8CxHQXvi0M5XY4deTXINfIiSG6w==}
@@ -527,10 +584,16 @@ packages:
brace-expansion@2.1.8:
resolution: {integrity: sha512-BnlDzDYQoplTsZSvPi86CNzmbcb07X8ufR8fk1zivaiEJlXJkiq1MQyDCVmlWcsWbj6aWXqHnrwwevbrm/Saig==}
+ codemirror@6.0.2:
+ resolution: {integrity: sha512-VhydHotNW5w1UGK0Qj96BwSk/Zqbp9WbnyK2W/eVMv4QyF41INRGpjUhFJY7/uDNuudSc33a/PKr4iDqRduvHw==}
+
copy-anything@4.1.5:
resolution: {integrity: sha512-vePst2VLTSqPglW7Q98VwFpGiGpOHTyXIo81MO5VyLecA5zMbZw/P/V1vmwD1jksa2iJpn/YkDrJ3XhTfzUyhQ==}
engines: {node: '>=18'}
+ crelt@1.0.7:
+ resolution: {integrity: sha512-aK6BbWfhf4U/wCcLHKPJl/xa6VkVstRaPywWtMKGwuOLc/wZTyQYuoxgvZnNsBvv7Kg3YTBQYYBCggcviQczuA==}
+
csstype@3.2.3:
resolution: {integrity: sha512-z1HGKcYy2xA8AGQfwrn0PAy+PB7X/GSj3UVJW9qKyn43xWa+gl5nXmU4qqLMRzWVLFC8KusUX8T/0kCiOYpAIQ==}
@@ -630,6 +693,9 @@ packages:
resolution: {integrity: sha512-1POYv7uv2gXoyGFpBCmpDVSNV74IfsWlDW216UPjbWufNf+bSU6GdbDsxdcxtfwb4xlI3yxzOTKClUosxARYrQ==}
engines: {node: '>=0.10.0'}
+ style-mod@4.1.4:
+ resolution: {integrity: sha512-XXWIQt633/EpAFx8aZDOTjBzrCaGmhvEQlQo6MVPfa2OzO2cWo+4hV9h+6UkHYlXGfy+ODXKUdP7Pthmcu5ATw==}
+
superjson@2.2.6:
resolution: {integrity: sha512-H+ue8Zo4vJmV2nRjpx86P35lzwDT3nItnIsocgumgr0hHMQ+ZGq5vrERg9kJBo5AWGmxZDhzDo+WVIJqkB0cGA==}
engines: {node: '>=16'}
@@ -700,6 +766,9 @@ packages:
typescript:
optional: true
+ w3c-keyname@2.2.8:
+ resolution: {integrity: sha512-dpojBhNsCNN7T82Tm7k26A6G9ML3NkhDsnw9n/eoxSRlVBB4CEtIQ/KTCLI2Fwf3ataSXRhYFkQi3SlnFwPvPQ==}
+
snapshots:
'@babel/helper-string-parser@7.29.14': {}
@@ -715,6 +784,64 @@ snapshots:
'@babel/helper-string-parser': 7.29.14
'@babel/helper-validator-identifier': 7.29.7
+ '@codemirror/autocomplete@6.20.4':
+ dependencies:
+ '@codemirror/language': 6.13.1
+ '@codemirror/state': 6.7.6
+ '@codemirror/view': 6.43.15
+ '@lezer/common': 1.5.5
+
+ '@codemirror/commands@6.11.1':
+ dependencies:
+ '@codemirror/language': 6.13.1
+ '@codemirror/state': 6.7.6
+ '@codemirror/view': 6.43.15
+ '@lezer/common': 1.5.5
+
+ '@codemirror/lang-sql@6.10.0':
+ dependencies:
+ '@codemirror/autocomplete': 6.20.4
+ '@codemirror/language': 6.13.1
+ '@codemirror/state': 6.7.6
+ '@lezer/common': 1.5.5
+ '@lezer/highlight': 1.2.5
+ '@lezer/lr': 1.4.12
+
+ '@codemirror/language@6.13.1':
+ dependencies:
+ '@codemirror/state': 6.7.6
+ '@codemirror/streamparser': 6.0.0
+ '@codemirror/view': 6.43.15
+ '@lezer/common': 1.5.5
+ '@lezer/highlight': 1.2.5
+ '@lezer/lr': 1.4.12
+ style-mod: 4.1.4
+
+ '@codemirror/lint@6.9.8':
+ dependencies:
+ '@codemirror/state': 6.7.6
+ '@codemirror/view': 6.43.15
+ crelt: 1.0.7
+
+ '@codemirror/search@6.7.2':
+ dependencies:
+ '@codemirror/state': 6.7.6
+ '@codemirror/view': 6.43.15
+ crelt: 1.0.7
+
+ '@codemirror/state@6.7.6':
+ dependencies:
+ '@marijn/find-cluster-break': 1.0.4
+
+ '@codemirror/streamparser@6.0.0': {}
+
+ '@codemirror/view@6.43.15':
+ dependencies:
+ '@codemirror/state': 6.7.6
+ crelt: 1.0.7
+ style-mod: 4.1.4
+ w3c-keyname: 2.2.8
+
'@esbuild/aix-ppc64@0.25.12':
optional: true
@@ -795,6 +922,18 @@ snapshots:
'@jridgewell/sourcemap-codec@1.6.0': {}
+ '@lezer/common@1.5.5': {}
+
+ '@lezer/highlight@1.2.5':
+ dependencies:
+ '@lezer/common': 1.5.5
+
+ '@lezer/lr@1.4.12':
+ dependencies:
+ '@lezer/common': 1.5.5
+
+ '@marijn/find-cluster-break@1.0.4': {}
+
'@rolldown/pluginutils@1.1.0': {}
'@rollup/rollup-android-arm-eabi@4.68.2':
@@ -1052,8 +1191,20 @@ snapshots:
dependencies:
balanced-match: 1.0.2
+ codemirror@6.0.2:
+ dependencies:
+ '@codemirror/autocomplete': 6.20.4
+ '@codemirror/commands': 6.11.1
+ '@codemirror/language': 6.13.1
+ '@codemirror/lint': 6.9.8
+ '@codemirror/search': 6.7.2
+ '@codemirror/state': 6.7.6
+ '@codemirror/view': 6.43.15
+
copy-anything@4.1.5: {}
+ crelt@1.0.7: {}
+
csstype@3.2.3: {}
de-indent@1.0.2: {}
@@ -1175,6 +1326,8 @@ snapshots:
speakingurl@14.0.1: {}
+ style-mod@4.1.4: {}
+
superjson@2.2.6:
dependencies:
copy-anything: 4.1.5
@@ -1214,3 +1367,5 @@ snapshots:
'@vue/shared': 3.5.45
optionalDependencies:
typescript: 5.8.3
+
+ w3c-keyname@2.2.8: {}
diff --git a/apps/tauri/src/App.vue b/apps/tauri/src/App.vue
index b9f39a93..e907f954 100644
--- a/apps/tauri/src/App.vue
+++ b/apps/tauri/src/App.vue
@@ -15,6 +15,7 @@ import TabStrip from "./ui/TabStrip.vue";
import StatusBar from "./ui/StatusBar.vue";
import WorkspaceEmptyHero from "./ui/WorkspaceEmptyHero.vue";
import QueryaDivider from "./ui/QueryaDivider.vue";
+import SqlWorkspace from "./ui/SqlWorkspace.vue";
const shell = useShellStore();
const status = useShellStatusStore();
@@ -27,6 +28,8 @@ const showEmpty = computed(
() => !connections.active && activeTab.value?.kind === "welcome",
);
+const showSql = computed(() => activeTab.value?.kind === "sql");
+
async function onOpenSqlite() {
try {
const selected = await open({
@@ -42,7 +45,6 @@ async function onOpenSqlite() {
const conn = await connections.connectSqlite(selected);
workspace.addTab({ title: conn.name, kind: "sql" });
} catch (err) {
- // Status already set by connections store on connect failure.
if (String(err).includes("cancel")) return;
}
}
@@ -110,12 +112,12 @@ onUnmounted(() => {
@open-sqlite="onOpenSqlite"
@open-tour="onOpenTour"
/>
+
Connected: {{ connections.active.path }}
-Kind: {{ activeTab?.kind }} — editor/grid land next in the slice.
{{ error }}
+ + +| {{ c }} | +
|---|
| + {{ cell === null || cell === undefined ? "NULL" : String(cell) }} + | +
Results appear here after Run.
+