specta-rs · oscartbeaumont · Sep 12, 2023 · Sep 7, 2023 · Sep 7, 2023 · Sep 12, 2023
diff --git a/.gitignore b/.gitignore
@@ -8,7 +8,6 @@ pnpm-debug.log*
 lerna-debug.log*
 
 node_modules
-dist
 dist-ssr
 *.local
 

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -18,15 +18,15 @@ rustdoc-args = ["--cfg", "docsrs"]
 
 [features]
 default = []
-javascript = []
+javascript = ["specta/typescript"]
 typescript = ["specta/typescript"]
 
 [dependencies]
 specta = { workspace = true, features = ["functions", "tauri"] }
 tauri-specta-macros = { path = "./macros" }
-serde = "1.0.188"
+serde = { workspace = true }
 serde_json = "1.0.106"
-tauri = "1.4.1"
+tauri = { workspace = true }
 thiserror = "1.0.48"
 heck = "0.4.1"
 indoc = "2.0.3"
@@ -36,11 +36,13 @@ doc-comment = "0.3.3"
 
 [workspace]
 members = [
-    "example/src-tauri",
-    "macros"
+    "examples/app/src-tauri",
+    "examples/custom-plugin/app/src-tauri",
+    "examples/custom-plugin/plugin",
+    "macros",
 ]
 
-
 [workspace.dependencies]
-# specta = { version = "=2.0.0-rc.1" }
-specta = { git = "https://github.com/oscartbeaumont/specta", rev = "5948d80f2551780eda2c7bf38450fc796c74cfbf" }
+specta = { version = "=2.0.0-rc.2" }
+serde = "1.0.188"
+tauri = "1.4.1"
diff --git a/examples/app/dist/.gitignore b/examples/app/dist/.gitignore
@@ -0,0 +1,5 @@
+# Ignore everything in this directory
+*
+# Except this file
+!.gitignore
+# This is done so that Tauri never complains that '../dist does not exist'
diff --git a/example/index.html → examples/app/index.html b/example/index.html → examples/app/index.html
diff --git a/example/package.json → examples/app/package.json b/example/package.json → examples/app/package.json
@@ -1,7 +1,6 @@
 {
-  "name": "example",
+  "name": "tauri-specta-example-app",
   "private": true,
-  "version": "0.0.0",
   "type": "module",
   "scripts": {
     "dev": "pnpm tauri dev",

diff --git a/example/pnpm-lock.yaml → examples/app/pnpm-lock.yaml b/example/pnpm-lock.yaml → examples/app/pnpm-lock.yaml
diff --git a/example/src-tauri/.gitignore → examples/app/src-tauri/.gitignore b/example/src-tauri/.gitignore → examples/app/src-tauri/.gitignore
diff --git a/example/src-tauri/Cargo.toml → examples/app/src-tauri/Cargo.toml b/example/src-tauri/Cargo.toml → examples/app/src-tauri/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "example"
+name = "tauri-specta-example-app"
 version = "0.0.0"
 description = "A Tauri App"
 authors = ["you"]
@@ -17,8 +17,8 @@ serde_json = "1.0"
 specta.workspace = true
 serde = { version = "1.0", features = ["derive"] }
 tauri = { version = "1.4.1", features = ["api-all"] }
-tauri-specta = { path = "../../", features = ["typescript", "javascript"] }
+tauri-specta = { path = "../../../", features = ["typescript", "javascript"] }
 
 [features]
-default = [ "custom-protocol" ]
-custom-protocol = [ "tauri/custom-protocol" ]
+default = ["custom-protocol"]
+custom-protocol = ["tauri/custom-protocol"]
diff --git a/example/src-tauri/build.rs → examples/app/src-tauri/build.rs b/example/src-tauri/build.rs → examples/app/src-tauri/build.rs
diff --git a/example/src-tauri/icons/128x128.png → examples/app/src-tauri/icons/128x128.png b/example/src-tauri/icons/128x128.png → examples/app/src-tauri/icons/128x128.png
diff --git a/example/src-tauri/icons/[email protected] → examples/app/src-tauri/icons/[email protected] b/example/src-tauri/icons/[email protected] → examples/app/src-tauri/icons/[email protected]
diff --git a/example/src-tauri/icons/32x32.png → examples/app/src-tauri/icons/32x32.png b/example/src-tauri/icons/32x32.png → examples/app/src-tauri/icons/32x32.png
diff --git a/...ple/src-tauri/icons/Square107x107Logo.png → ...app/src-tauri/icons/Square107x107Logo.png b/...ple/src-tauri/icons/Square107x107Logo.png → ...app/src-tauri/icons/Square107x107Logo.png
diff --git a/...ple/src-tauri/icons/Square142x142Logo.png → ...app/src-tauri/icons/Square142x142Logo.png b/...ple/src-tauri/icons/Square142x142Logo.png → ...app/src-tauri/icons/Square142x142Logo.png
diff --git a/...ple/src-tauri/icons/Square150x150Logo.png → ...app/src-tauri/icons/Square150x150Logo.png b/...ple/src-tauri/icons/Square150x150Logo.png → ...app/src-tauri/icons/Square150x150Logo.png
diff --git a/...ple/src-tauri/icons/Square284x284Logo.png → ...app/src-tauri/icons/Square284x284Logo.png b/...ple/src-tauri/icons/Square284x284Logo.png → ...app/src-tauri/icons/Square284x284Logo.png
diff --git a/example/src-tauri/icons/Square30x30Logo.png → ...s/app/src-tauri/icons/Square30x30Logo.png b/example/src-tauri/icons/Square30x30Logo.png → ...s/app/src-tauri/icons/Square30x30Logo.png
diff --git a/...ple/src-tauri/icons/Square310x310Logo.png → ...app/src-tauri/icons/Square310x310Logo.png b/...ple/src-tauri/icons/Square310x310Logo.png → ...app/src-tauri/icons/Square310x310Logo.png
diff --git a/example/src-tauri/icons/Square44x44Logo.png → ...s/app/src-tauri/icons/Square44x44Logo.png b/example/src-tauri/icons/Square44x44Logo.png → ...s/app/src-tauri/icons/Square44x44Logo.png
diff --git a/example/src-tauri/icons/Square71x71Logo.png → ...s/app/src-tauri/icons/Square71x71Logo.png b/example/src-tauri/icons/Square71x71Logo.png → ...s/app/src-tauri/icons/Square71x71Logo.png
diff --git a/example/src-tauri/icons/Square89x89Logo.png → ...s/app/src-tauri/icons/Square89x89Logo.png b/example/src-tauri/icons/Square89x89Logo.png → ...s/app/src-tauri/icons/Square89x89Logo.png
diff --git a/example/src-tauri/icons/StoreLogo.png → examples/app/src-tauri/icons/StoreLogo.png b/example/src-tauri/icons/StoreLogo.png → examples/app/src-tauri/icons/StoreLogo.png
diff --git a/example/src-tauri/icons/icon.icns → examples/app/src-tauri/icons/icon.icns b/example/src-tauri/icons/icon.icns → examples/app/src-tauri/icons/icon.icns
diff --git a/example/src-tauri/icons/icon.ico → examples/app/src-tauri/icons/icon.ico b/example/src-tauri/icons/icon.ico → examples/app/src-tauri/icons/icon.ico
diff --git a/example/src-tauri/icons/icon.png → examples/app/src-tauri/icons/icon.png b/example/src-tauri/icons/icon.png → examples/app/src-tauri/icons/icon.png
diff --git a/example/src-tauri/src/main.rs → examples/app/src-tauri/src/main.rs b/example/src-tauri/src/main.rs → examples/app/src-tauri/src/main.rs
diff --git a/example/src-tauri/tauri.conf.json → examples/app/src-tauri/tauri.conf.json b/example/src-tauri/tauri.conf.json → examples/app/src-tauri/tauri.conf.json
diff --git a/example/src/assets/tauri.svg → examples/app/src/assets/tauri.svg b/example/src/assets/tauri.svg → examples/app/src/assets/tauri.svg
diff --git a/example/src/assets/typescript.svg → examples/app/src/assets/typescript.svg b/example/src/assets/typescript.svg → examples/app/src/assets/typescript.svg
diff --git a/example/src/assets/vite.svg → examples/app/src/assets/vite.svg b/example/src/assets/vite.svg → examples/app/src/assets/vite.svg
diff --git a/example/src/bindings.ts → examples/app/src/bindings.ts b/example/src/bindings.ts → examples/app/src/bindings.ts
diff --git a/example/src/main.ts → examples/app/src/main.ts b/example/src/main.ts → examples/app/src/main.ts
diff --git a/example/src/style.css → examples/app/src/style.css b/example/src/style.css → examples/app/src/style.css
diff --git a/example/tsconfig.json → examples/app/tsconfig.json b/example/tsconfig.json → examples/app/tsconfig.json
diff --git a/example/vite.config.js → examples/app/vite.config.js b/example/vite.config.js → examples/app/vite.config.js
diff --git a/examples/custom-plugin/app/dist/.gitignore b/examples/custom-plugin/app/dist/.gitignore
@@ -0,0 +1,5 @@
+# Ignore everything in this directory
+*
+# Except this file
+!.gitignore
+# This is done so that Tauri never complains that '../dist does not exist'
diff --git a/examples/custom-plugin/app/index.html b/examples/custom-plugin/app/index.html
@@ -0,0 +1,17 @@
+<!doctype html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <meta name="theme-color" content="#000000" />
+    <link rel="icon" type="image/svg+xml" href="/src/assets/logo.svg" />
+    <title>Tauri + Solid + Typescript App</title>
+  </head>
+
+  <body>
+    <noscript>You need to enable JavaScript to run this app.</noscript>
+    <div id="root"></div>
+
+    <script src="/src/index.tsx" type="module"></script>
+  </body>
+</html>
diff --git a/examples/custom-plugin/app/package.json b/examples/custom-plugin/app/package.json
@@ -0,0 +1,24 @@
+{
+  "name": "tauri-specta-example-custom-plugin-app",
+  "version": "0.0.0",
+  "description": "",
+  "scripts": {
+    "start": "vite",
+    "dev": "vite",
+    "build": "vite build",
+    "serve": "vite preview",
+    "tauri": "tauri"
+  },
+  "license": "MIT",
+  "dependencies": {
+    "solid-js": "^1.7.8",
+    "@tauri-apps/api": "^1.4.0",
+    "tauri-specta-custom-plugin": "workspace:*"
+  },
+  "devDependencies": {
+    "typescript": "^5.0.2",
+    "vite": "^4.4.4",
+    "vite-plugin-solid": "^2.7.0",
+    "@tauri-apps/cli": "^1.4.0"
+  }
+}
diff --git a/examples/custom-plugin/app/public/tauri.svg b/examples/custom-plugin/app/public/tauri.svg
diff --git a/examples/custom-plugin/app/public/vite.svg b/examples/custom-plugin/app/public/vite.svg
diff --git a/examples/custom-plugin/app/src-tauri/.gitignore b/examples/custom-plugin/app/src-tauri/.gitignore
@@ -0,0 +1,4 @@
+# Generated by Cargo
+# will have compiled files and executables
+/target/
+
diff --git a/examples/custom-plugin/app/src-tauri/Cargo.toml b/examples/custom-plugin/app/src-tauri/Cargo.toml
@@ -0,0 +1,24 @@
+[package]
+name = "tauri-specta-example-custom-plugin-app"
+version = "0.0.0"
+description = "A Tauri App"
+authors = ["you"]
+license = ""
+repository = ""
+edition = "2021"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[build-dependencies]
+tauri-build = { version = "1.4", features = [] }
+
+[dependencies]
+tauri = { version = "1.4", features = ["shell-open"] }
+serde = { version = "1.0", features = ["derive"] }
+serde_json = "1.0"
+tauri-specta-example-custom-plugin = { path = "../../plugin" }
+
+[features]
+# this feature is used for production builds or when `devPath` points to the filesystem
+# DO NOT REMOVE!!
+custom-protocol = ["tauri/custom-protocol"]
diff --git a/examples/custom-plugin/app/src-tauri/build.rs b/examples/custom-plugin/app/src-tauri/build.rs
@@ -0,0 +1,3 @@
+fn main() {
+  tauri_build::build()
+}
diff --git a/examples/custom-plugin/app/src-tauri/icons/128x128.png b/examples/custom-plugin/app/src-tauri/icons/128x128.png
diff --git a/examples/custom-plugin/app/src-tauri/icons/[email protected] b/examples/custom-plugin/app/src-tauri/icons/[email protected]
diff --git a/examples/custom-plugin/app/src-tauri/icons/32x32.png b/examples/custom-plugin/app/src-tauri/icons/32x32.png
diff --git a/examples/custom-plugin/app/src-tauri/icons/Square107x107Logo.png b/examples/custom-plugin/app/src-tauri/icons/Square107x107Logo.png
diff --git a/examples/custom-plugin/app/src-tauri/icons/Square142x142Logo.png b/examples/custom-plugin/app/src-tauri/icons/Square142x142Logo.png
diff --git a/examples/custom-plugin/app/src-tauri/icons/Square150x150Logo.png b/examples/custom-plugin/app/src-tauri/icons/Square150x150Logo.png
diff --git a/examples/custom-plugin/app/src-tauri/icons/Square284x284Logo.png b/examples/custom-plugin/app/src-tauri/icons/Square284x284Logo.png
diff --git a/examples/custom-plugin/app/src-tauri/icons/Square30x30Logo.png b/examples/custom-plugin/app/src-tauri/icons/Square30x30Logo.png
diff --git a/examples/custom-plugin/app/src-tauri/icons/Square310x310Logo.png b/examples/custom-plugin/app/src-tauri/icons/Square310x310Logo.png
diff --git a/examples/custom-plugin/app/src-tauri/icons/Square44x44Logo.png b/examples/custom-plugin/app/src-tauri/icons/Square44x44Logo.png
diff --git a/examples/custom-plugin/app/src-tauri/icons/Square71x71Logo.png b/examples/custom-plugin/app/src-tauri/icons/Square71x71Logo.png
diff --git a/examples/custom-plugin/app/src-tauri/icons/Square89x89Logo.png b/examples/custom-plugin/app/src-tauri/icons/Square89x89Logo.png
diff --git a/examples/custom-plugin/app/src-tauri/icons/StoreLogo.png b/examples/custom-plugin/app/src-tauri/icons/StoreLogo.png
diff --git a/examples/custom-plugin/app/src-tauri/icons/icon.icns b/examples/custom-plugin/app/src-tauri/icons/icon.icns
diff --git a/examples/custom-plugin/app/src-tauri/icons/icon.ico b/examples/custom-plugin/app/src-tauri/icons/icon.ico
diff --git a/examples/custom-plugin/app/src-tauri/icons/icon.png b/examples/custom-plugin/app/src-tauri/icons/icon.png
diff --git a/examples/custom-plugin/app/src-tauri/src/main.rs b/examples/custom-plugin/app/src-tauri/src/main.rs
@@ -0,0 +1,9 @@
+// Prevents additional console window on Windows in release, DO NOT REMOVE!!
+#![cfg_attr(not(debug_assertions), windows_subsystem = "windows")]
+
+fn main() {
+    tauri::Builder::default()
+        .plugin(tauri_specta_example_custom_plugin::init())
+        .run(tauri::generate_context!())
+        .expect("error while running tauri application");
+}
diff --git a/examples/custom-plugin/app/src-tauri/tauri.conf.json b/examples/custom-plugin/app/src-tauri/tauri.conf.json
@@ -0,0 +1,46 @@
+{
+  "build": {
+    "beforeDevCommand": "pnpm dev",
+    "beforeBuildCommand": "pnpm build",
+    "devPath": "http://localhost:1420",
+    "distDir": "../dist",
+    "withGlobalTauri": false
+  },
+  "package": {
+    "productName": "app",
+    "version": "0.0.0"
+  },
+  "tauri": {
+    "allowlist": {
+      "all": false,
+      "shell": {
+        "all": false,
+        "open": true
+      }
+    },
+    "bundle": {
+      "active": true,
+      "targets": "all",
+      "identifier": "com.tauri.dev",
+      "icon": [
+        "icons/32x32.png",
+        "icons/128x128.png",
+        "icons/[email protected]",
+        "icons/icon.icns",
+        "icons/icon.ico"
+      ]
+    },
+    "security": {
+      "csp": null
+    },
+    "windows": [
+      {
+        "fullscreen": false,
+        "resizable": true,
+        "title": "app",
+        "width": 800,
+        "height": 600
+      }
+    ]
+  }
+}
diff --git a/examples/custom-plugin/app/src/App.tsx b/examples/custom-plugin/app/src/App.tsx
@@ -0,0 +1,50 @@
+import { Match, Switch, createSignal, onCleanup } from "solid-js";
+import { events, addNumbers } from "tauri-specta-custom-plugin";
+
+function App() {
+  const [latestNumber, setLatestNumber] = createSignal<number | null>(null);
+
+  const [generatedNumber, setGeneratedNumber] = createSignal<
+    { type: "loading" } | { type: "loaded"; value: number } | null
+  >(null);
+
+  events.randomNumber
+    .listen((e) => setLatestNumber(e.payload))
+    .then((unlisten) => onCleanup(unlisten));
+
+  return (
+    <div>
+      <p>Latest Random Number: {latestNumber()}</p>
+      <button
+        disabled={generatedNumber()?.type === "loading"}
+        onClick={() => {
+          setGeneratedNumber({ type: "loading" });
+
+          addNumbers(
+            Math.floor(Math.random() * 10),
+            Math.floor(Math.random() * 10)
+          )
+            .then((value) => setGeneratedNumber({ type: "loaded", value }))
+            .catch(() => setGeneratedNumber(null));
+        }}
+      >
+        Generate Random Number
+      </button>
+      <Switch fallback="Generate a number!">
+        <Match when={generatedNumber()?.type === "loading"}>
+          Loading number...
+        </Match>
+        <Match
+          when={(() => {
+            const n = generatedNumber();
+            return n?.type === "loaded" && n.value;
+          })()}
+        >
+          {(value) => value()}
+        </Match>
+      </Switch>
+    </div>
+  );
+}
+
+export default App;
diff --git a/examples/custom-plugin/app/src/index.tsx b/examples/custom-plugin/app/src/index.tsx
@@ -0,0 +1,6 @@
+/* @refresh reload */
+import { render } from "solid-js/web";
+
+import App from "./App";
+
+render(() => <App />, document.getElementById("root") as HTMLElement);
-Original file line number
+Diff line change
@@ Expand Up / @@ -8,7 +8,6 @@ pnpm-debug.log* @@
     lerna-debug.log*
     node_modules
-    dist
     dist-ssr
     *.local
@@ Expand Down @@