more tauri stuff (#128)

2023-06-19 10:16:45 +10:00
parent e7c1554129
commit 0858d32c1e
11 changed files with 363 additions and 18 deletions
--- a/package.json
+++ b/package.json
@ -7,6 +7,7 @@
    "@headlessui/react": "^1.7.13",
    "@react-three/drei": "^9.42.0",
    "@react-three/fiber": "^8.9.1",
+    "@tauri-apps/api": "^1.3.0",
    "@testing-library/jest-dom": "^5.14.1",
    "@testing-library/react": "^13.0.0",
    "@testing-library/user-event": "^13.2.1",
@ -25,6 +26,7 @@
    "sketch-helpers": "^0.0.2",
    "swr": "^2.0.4",
    "three": "^0.146.0",
+    "toml": "^3.0.0",
    "typescript": "^4.4.2",
    "util": "^0.12.5",
    "uuid": "^9.0.0",
@ -54,7 +56,7 @@
  },
  "jest": {
    "transformIgnorePatterns": [
-      "node_modules/(?!(three|allotment)/)"
+      "node_modules/(?!(three|allotment|@tauri-apps\/api)/)"
    ]
  },
  "prettier": {
--- a/src-tauri/Cargo.lock
+++ b/src-tauri/Cargo.lock
@ -66,10 +66,12 @@ checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8"
 name = "app"
 version = "0.1.0"
 dependencies = [
+ "anyhow",
 "serde",
 "serde_json",
 "tauri",
 "tauri-build",
+ "toml 0.6.0",
 ]

 [[package]]
@ -1525,6 +1527,15 @@ version = "0.1.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb"

+[[package]]
+name = "nom8"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ae01545c9c7fc4486ab7debaf2aad7003ac19431791868fb2e8066df97fad2f8"
+dependencies = [
+ "memchr",
+]
+
 [[package]]
 name = "nu-ansi-term"
 version = "0.46.0"
@ -1615,6 +1626,17 @@ dependencies = [
 "objc_exception",
 ]

+[[package]]
+name = "objc-foundation"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1add1b659e36c9607c7aab864a76c7a4c2760cd0cd2e120f3fb8b952c7e22bf9"
+dependencies = [
+ "block",
+ "objc",
+ "objc_id",
+]
+
 [[package]]
 name = "objc_exception"
 version = "0.1.2"
@ -1861,7 +1883,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919"
 dependencies = [
 "once_cell",
- "toml_edit",
+ "toml_edit 0.19.8",
 ]

 [[package]]
@ -2072,6 +2094,30 @@ version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "436b050e76ed2903236f032a59761c1eb99e1b0aead2c257922771dab1fc8c78"

+[[package]]
+name = "rfd"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0149778bd99b6959285b0933288206090c50e2327f47a9c463bfdbf45c8823ea"
+dependencies = [
+ "block",
+ "dispatch",
+ "glib-sys",
+ "gobject-sys",
+ "gtk-sys",
+ "js-sys",
+ "lazy_static",
+ "log",
+ "objc",
+ "objc-foundation",
+ "objc_id",
+ "raw-window-handle",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
+ "web-sys",
+ "windows 0.37.0",
+]
+
 [[package]]
 name = "rustc_version"
 version = "0.4.0"
@ -2543,6 +2589,7 @@ dependencies = [
 "percent-encoding",
 "rand 0.8.5",
 "raw-window-handle",
+ "rfd",
 "semver",
 "serde",
 "serde_json",
@ -2809,6 +2856,18 @@ dependencies = [
 "serde",
 ]

+[[package]]
+name = "toml"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4fb9d890e4dc9298b70f740f615f2e05b9db37dce531f6b24fb77ac993f9f217"
+dependencies = [
+ "serde",
+ "serde_spanned",
+ "toml_datetime 0.5.1",
+ "toml_edit 0.18.1",
+]
+
 [[package]]
 name = "toml"
 version = "0.7.3"
@ -2817,8 +2876,17 @@ checksum = "b403acf6f2bb0859c93c7f0d967cb4a75a7ac552100f9322faf64dc047669b21"
 dependencies = [
 "serde",
 "serde_spanned",
- "toml_datetime",
- "toml_edit",
+ "toml_datetime 0.6.2",
+ "toml_edit 0.19.8",
+]
+
+[[package]]
+name = "toml_datetime"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4553f467ac8e3d374bc9a177a26801e5d0f9b211aa1673fb137a403afd1c9cf5"
+dependencies = [
+ "serde",
 ]

 [[package]]
@ -2830,6 +2898,19 @@ dependencies = [
 "serde",
 ]

+[[package]]
+name = "toml_edit"
+version = "0.18.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "56c59d8dd7d0dcbc6428bf7aa2f0e823e26e43b3c9aca15bbc9475d23e5fa12b"
+dependencies = [
+ "indexmap",
+ "nom8",
+ "serde",
+ "serde_spanned",
+ "toml_datetime 0.5.1",
+]
+
 [[package]]
 name = "toml_edit"
 version = "0.19.8"
@ -2839,7 +2920,7 @@ dependencies = [
 "indexmap",
 "serde",
 "serde_spanned",
- "toml_datetime",
+ "toml_datetime 0.6.2",
 "winnow",
 ]

@ -3065,6 +3146,18 @@ dependencies = [
 "wasm-bindgen-shared",
 ]

+[[package]]
+name = "wasm-bindgen-futures"
+version = "0.4.36"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2d1985d03709c53167ce907ff394f5316aa22cb4e12761295c5dc57dacb6297e"
+dependencies = [
+ "cfg-if",
+ "js-sys",
+ "wasm-bindgen",
+ "web-sys",
+]
+
 [[package]]
 name = "wasm-bindgen-macro"
 version = "0.2.86"
@ -3094,6 +3187,16 @@ version = "0.2.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ed9d5b4305409d1fc9482fee2d7f9bcbf24b3972bf59817ef757e23982242a93"

+[[package]]
+name = "web-sys"
+version = "0.3.63"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3bdd9ef4e984da1187bf8110c5cf5b845fbc87a23602cdf912386a76fcd3a7c2"
+dependencies = [
+ "js-sys",
+ "wasm-bindgen",
+]
+
 [[package]]
 name = "webkit2gtk"
 version = "0.18.2"
@ -3210,6 +3313,19 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"

+[[package]]
+name = "windows"
+version = "0.37.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "57b543186b344cc61c85b5aab0d2e3adf4e0f99bc076eff9aa5927bcc0b8a647"
+dependencies = [
+ "windows_aarch64_msvc 0.37.0",
+ "windows_i686_gnu 0.37.0",
+ "windows_i686_msvc 0.37.0",
+ "windows_x86_64_gnu 0.37.0",
+ "windows_x86_64_msvc 0.37.0",
+]
+
 [[package]]
 name = "windows"
 version = "0.39.0"
@ -3325,6 +3441,12 @@ version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc"

+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.37.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2623277cb2d1c216ba3b578c0f3cf9cdebeddb6e66b1b218bb33596ea7769c3a"
+
 [[package]]
 name = "windows_aarch64_msvc"
 version = "0.39.0"
@ -3343,6 +3465,12 @@ version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3"

+[[package]]
+name = "windows_i686_gnu"
+version = "0.37.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d3925fd0b0b804730d44d4b6278c50f9699703ec49bcd628020f46f4ba07d9e1"
+
 [[package]]
 name = "windows_i686_gnu"
 version = "0.39.0"
@ -3361,6 +3489,12 @@ version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241"

+[[package]]
+name = "windows_i686_msvc"
+version = "0.37.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ce907ac74fe331b524c1298683efbf598bb031bc84d5e274db2083696d07c57c"
+
 [[package]]
 name = "windows_i686_msvc"
 version = "0.39.0"
@ -3379,6 +3513,12 @@ version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00"

+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.37.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2babfba0828f2e6b32457d5341427dcbb577ceef556273229959ac23a10af33d"
+
 [[package]]
 name = "windows_x86_64_gnu"
 version = "0.39.0"
@ -3409,6 +3549,12 @@ version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953"

+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.37.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f4dd6dc7df2d84cf7b33822ed5b86318fb1781948e9663bacd047fc9dd52259d"
+
 [[package]]
 name = "windows_x86_64_msvc"
 version = "0.39.0"
--- a/src-tauri/Cargo.toml
+++ b/src-tauri/Cargo.toml
@ -17,10 +17,12 @@ tauri-build = { version = "1.3.0", features = [] }
 [dependencies]
 serde_json = "1.0"
 serde = { version = "1.0", features = ["derive"] }
-tauri = { version = "1.3.0", features = [] }
+tauri = { version = "1.3.0", features = ["dialog-all", "fs-all"] }
+anyhow = "1"
+toml = "0.6.0"

 [features]
 # this feature is used for production builds or when `devPath` points to the filesystem and the built-in dev server is disabled.
 # If you use cargo directly instead of tauri's cli you can use this feature flag to switch between tauri's `dev` and `build` modes.
 # DO NOT REMOVE!!
-custom-protocol = [ "tauri/custom-protocol" ]
+custom-protocol = ["tauri/custom-protocol"]
--- a/src-tauri/src/main.rs
+++ b/src-tauri/src/main.rs
@ -1,8 +1,46 @@
 // Prevents additional console window on Windows in release, DO NOT REMOVE!!
 #![cfg_attr(not(debug_assertions), windows_subsystem = "windows")]

+use std::io::Read;
+
+use anyhow::Result;
+use tauri::InvokeError;
+use toml;
+use tauri::Manager;
+
+/// This command returns the a json string parse from a toml file at the path.
+#[tauri::command]
+fn read_toml(path: &str) -> Result<String, InvokeError> {
+  let mut file = std::fs::File::open(path).map_err(|e| InvokeError::from_anyhow(e.into()))?;
+  let mut contents = String::new();
+  file.read_to_string(&mut contents).map_err(|e| InvokeError::from_anyhow(e.into()))?;
+  let value = toml::from_str::<toml::Value>(&contents).map_err(|e| InvokeError::from_anyhow(e.into()))?;
+  let value = serde_json::to_string(&value).map_err(|e| InvokeError::from_anyhow(e.into()))?;
+  Ok(value.to_string())
+}
+
+// This command returns a string that is the contents of a file at the path.
+#[tauri::command]
+fn read_txt_file(path: &str) -> Result<String, InvokeError> {
+  let mut file = std::fs::File::open(path).map_err(|e| InvokeError::from_anyhow(e.into()))?;
+  let mut contents = String::new();
+  file.read_to_string(&mut contents).map_err(|e| InvokeError::from_anyhow(e.into()))?;
+  Ok(contents)
+}
+
 fn main() {
  tauri::Builder::default()
+    .setup(|app| {
+      #[cfg(debug_assertions)] // only include this code on debug builds
+      {
+        let window = app.get_window("main").unwrap();
+        // comment out the below if you don't devtools to open everytime.
+        // it's useful because otherwise devtools shuts everytime rust code changes.
+        window.open_devtools();
+      }
+      Ok(())
+   })
+    .invoke_handler(tauri::generate_handler![read_toml, read_txt_file])
    .run(tauri::generate_context!())
    .expect("error while running tauri application");
 }
--- a/src-tauri/tauri.conf.json
+++ b/src-tauri/tauri.conf.json
@ -7,12 +7,24 @@
    "distDir": "../build"
  },
  "package": {
-    "productName": "untitled-app",
-    "version": "0.1.0"
+    "productName": "paraffin",
+    "version": "0.0.2"
  },
  "tauri": {
    "allowlist": {
-      "all": false
+      "all": false,
+      "dialog": {
+        "all": true,
+        "ask": true,
+        "confirm": true,
+        "message": true,
+        "open": true,
+        "save": true
+      },
+      "fs": {
+        "scope": ["$HOME/**/*"],
+        "all": true
+      }
    },
    "bundle": {
      "active": true,
@ -56,10 +68,10 @@
    "windows": [
      {
        "fullscreen": false,
-        "height": 600,
+        "height": 1200,
        "resizable": true,
-        "title": "untitled-app",
-        "width": 800
+        "title": "paraffin",
+        "width": 1800
      }
    ]
  }
--- a/src/components/OpenFileButton.tsx
+++ b/src/components/OpenFileButton.tsx
@ -0,0 +1,42 @@
+import { invoke } from '@tauri-apps/api/tauri'
+import { open } from '@tauri-apps/api/dialog'
+import { useStore } from '../useStore'
+
+export const OpenFileButton = () => {
+  const { setCode } = useStore((s) => ({
+    setCode: s.setCode,
+  }))
+  const handleClick = async () => {
+    const selected = await open({
+      multiple: false,
+      directory: false,
+      filters: [
+        {
+          name: 'CAD',
+          extensions: ['toml'],
+        },
+      ],
+    })
+    if (Array.isArray(selected)) {
+      // User selected multiple files
+      // We should not get here, since multiple is false.
+    } else if (selected === null) {
+      // User cancelled the selection
+      // Do nothing.
+    } else {
+      // User selected a single file
+      // We want to invoke our command to read the file.
+      const json: string = await invoke('read_toml', { path: selected })
+      const packageDetails = JSON.parse(json).package
+      if (packageDetails.main) {
+        const absPath = [
+          ...selected.split('/').slice(0, -1),
+          packageDetails.main,
+        ].join('/')
+        const file: string = await invoke('read_txt_file', { path: absPath })
+        setCode(file)
+      }
+    }
+  }
+  return <button onClick={() => handleClick()}>Open File</button>
+}
--- a/src/hooks/useTauriBoot.ts
+++ b/src/hooks/useTauriBoot.ts
@ -0,0 +1,67 @@
+import { useEffect } from 'react'
+import { useStore } from '../useStore'
+import { parse } from 'toml'
+import {
+  createDir,
+  BaseDirectory,
+  readDir,
+  readTextFile,
+} from '@tauri-apps/api/fs'
+
+export const useTauriBoot = () => {
+  const { defaultDir, setDefaultDir, setHomeMenuItems } = useStore((s) => ({
+    defaultDir: s.defaultDir,
+    setDefaultDir: s.setDefaultDir,
+    setHomeMenuItems: s.setHomeMenuItems,
+  }))
+  useEffect(() => {
+    const isTauri = (window as any).__TAURI__
+    if (!isTauri) return
+    const run = async () => {
+      if (!defaultDir.base) {
+        createDir('puffin-projects/example', {
+          dir: BaseDirectory.Home,
+          recursive: true,
+        })
+        setDefaultDir({
+          base: BaseDirectory.Home,
+          dir: 'puffin-projects',
+        })
+      } else {
+        const directoryResult = await readDir(defaultDir.dir, {
+          dir: defaultDir.base,
+          recursive: true,
+        })
+        const puffinProjects = directoryResult.filter(
+          (file) =>
+            !file?.name?.startsWith('.') &&
+            file?.children?.find((child) => child?.name === 'wax.toml')
+        )
+
+        const tomlFiles = await Promise.all(
+          puffinProjects.map(async (file) => {
+            const parsedToml = parse(
+              await readTextFile(`${file.path}/wax.toml`, {
+                dir: defaultDir.base,
+              })
+            )
+            const mainPath = parsedToml?.package?.main
+            const projectName = parsedToml?.package?.name
+            return {
+              file,
+              mainPath,
+              projectName,
+            }
+          })
+        )
+        setHomeMenuItems(
+          tomlFiles.map(({ file, mainPath, projectName }) => ({
+            name: projectName,
+            path: mainPath ? `${file.path}/${mainPath}` : file.path,
+          }))
+        )
+      }
+    }
+    run()
+  }, [])
+}
--- a/src/index.tsx
+++ b/src/index.tsx
@ -1,4 +1,3 @@
-import React from 'react'
 import ReactDOM from 'react-dom/client'
 import './index.css'
 import { Auth } from './Auth'
@ -6,9 +5,7 @@ import reportWebVitals from './reportWebVitals'

 const root = ReactDOM.createRoot(document.getElementById('root') as HTMLElement)
 root.render(
-  <React.StrictMode>
  <Auth />
-  </React.StrictMode>
 )

 // If you want to start measuring performance in your app, pass a function
--- a/src/lang/rust.ts
+++ b/src/lang/rust.ts
@ -3,6 +3,8 @@ import init from '../wasm-lib/pkg/wasm_lib'
 const url =
  typeof window === 'undefined'
    ? 'http://127.0.0.1:3000'
+    : window.location.origin.includes('tauri://localhost')
+    ? 'tauri://localhost'
    : window.location.origin.includes('localhost')
    ? 'http://127.0.0.1:3000'
    : window.location.origin
--- a/src/useStore.ts
+++ b/src/useStore.ts
@ -13,6 +13,7 @@ import {
 import { recast } from './lang/recast'
 import { asyncLexer } from './lang/tokeniser'
 import { EditorSelection } from '@codemirror/state'
+import { BaseDirectory } from '@tauri-apps/api/fs'

 export type Selection = {
  type: 'default' | 'line-end' | 'line-mid'
@ -88,6 +89,11 @@ export type GuiModes =
      position: Position
    }

+interface DefaultDir {
+  base?: BaseDirectory
+  dir: string
+}
+
 export interface StoreState {
  editorView: EditorView | null
  setEditorView: (editorView: EditorView) => void
@ -125,6 +131,17 @@ export interface StoreState {
  setProgramMemory: (programMemory: ProgramMemory) => void
  isShiftDown: boolean
  setIsShiftDown: (isShiftDown: boolean) => void
+
+  // tauri specific app settings
+  defaultDir: DefaultDir
+  setDefaultDir: (dir: DefaultDir) => void
+  showHomeMenu: boolean
+  setHomeShowMenu: (showMenu: boolean) => void
+  homeMenuItems: {
+    name: string
+    path: string
+  }[]
+  setHomeMenuItems: (items: { name: string; path: string }[]) => void
 }

 let pendingAstUpdates: number[] = []
@ -248,12 +265,22 @@ export const useStore = create<StoreState>()(
      setProgramMemory: (programMemory) => set({ programMemory }),
      isShiftDown: false,
      setIsShiftDown: (isShiftDown) => set({ isShiftDown }),
+
+      // tauri specific app settings
+      defaultDir: {
+        dir: '',
+      },
+      setDefaultDir: (dir) => set({ defaultDir: dir }),
+      showHomeMenu: true,
+      setHomeShowMenu: (showHomeMenu) => set({ showHomeMenu }),
+      homeMenuItems: [],
+      setHomeMenuItems: (homeMenuItems) => set({ homeMenuItems }),
    }),
    {
      name: 'store',
      partialize: (state) =>
        Object.fromEntries(
-          Object.entries(state).filter(([key]) => ['code'].includes(key))
+          Object.entries(state).filter(([key]) => ['code', 'defaultDir'].includes(key))
        ),
    }
  )
--- a/yarn.lock
+++ b/yarn.lock
@ -2223,6 +2223,11 @@
    "@svgr/plugin-svgo" "^5.5.0"
    loader-utils "^2.0.0"

+"@tauri-apps/api@^1.3.0":
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/@tauri-apps/api/-/api-1.3.0.tgz#d0c853ab2cc7506bd826c5f7f260c67c7c15def5"
+  integrity sha512-AH+3FonkKZNtfRtGrObY38PrzEj4d+1emCbwNGu0V2ENbXjlLHMZQlUh+Bhu/CRmjaIwZMGJ3yFvWaZZgTHoog==
+
 "@tauri-apps/cli-darwin-arm64@1.3.1":
  version "1.3.1"
  resolved "https://registry.yarnpkg.com/@tauri-apps/cli-darwin-arm64/-/cli-darwin-arm64-1.3.1.tgz#ef0fe290e0a6e3e53fa2cc4f1a72a0c87921427c"
@ -10047,6 +10052,11 @@ toidentifier@1.0.1:
  resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.1.tgz#3be34321a88a820ed1bd80dfaa33e479fbb8dd35"
  integrity sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==

+toml@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/toml/-/toml-3.0.0.tgz#342160f1af1904ec9d204d03a5d61222d762c5ee"
+  integrity sha512-y/mWCZinnvxjTKYhJ+pYxwD0mRLVvOtdS2Awbgxln6iEnt4rk0yBxeSBHkGJcPucRiG0e55mwWp+g/05rsrd6w==
+
 tough-cookie@^4.0.0:
  version "4.1.2"
  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.1.2.tgz#e53e84b85f24e0b65dd526f46628db6c85f6b874"