Added remaining Http Error codes

.github/FUNDING.yml

@@ -0,0 +1,2 @@
+github: [oscartbeaumont]
+custom: ["https://paypal.me/oscartbeaumont"]

.github/dependabot.yml

@@ -0,0 +1,6 @@
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"

.github/scripts/setPackageVersions.js

@@ -0,0 +1,71 @@
+/**
+ * Updates the package.json files with a version to release to npm under
+ * the main tag.
+ *
+ * Based on https://github.com/facebook/relay/blob/main/gulpfile.js
+ */
+
+const fs = require("fs/promises");
+const path = require("path");
+
+const RELEASE_COMMIT_SHA = process.env.RELEASE_COMMIT_SHA;
+
+if (RELEASE_COMMIT_SHA && RELEASE_COMMIT_SHA.length !== 40) {
+  throw new Error(
+    "If the RELEASE_COMMIT_SHA env variable is set, it should be set to the " +
+      "40 character git commit hash."
+  );
+}
+
+const VERSION = RELEASE_COMMIT_SHA
+  ? `0.0.0-main-${RELEASE_COMMIT_SHA.substring(0, 8)}`
+  : process.env.npm_package_version;
+
+console.log(RELEASE_COMMIT_SHA);
+
+async function main() {
+  const packages = await (
+    await fs.readdir(path.join(__dirname, "../../packages"))
+  ).filter((pkg) => pkg !== ".DS_Store" && pkg !== "tsconfig.json");
+  const pkgJsons = {};
+  const pkgJsonPaths = {};
+
+  for (pkg of packages) {
+    const pkgJsonPath = path.join(
+      __dirname,
+      "../../packages",
+      pkg,
+      "package.json"
+    );
+    pkgJsonPaths[pkg] = pkgJsonPath;
+    const packageJson = JSON.parse(await fs.readFile(pkgJsonPath, "utf8"));
+
+    pkgJsons[pkg] = packageJson;
+  }
+
+  const packageNames = Object.values(pkgJsons).map((pkg) => pkg.name);
+
+  for (const pkg of packages) {
+    let packageJson = pkgJsons[pkg];
+    packageJson.version = VERSION;
+    for (const depKind of [
+      "dependencies",
+      "devDependencies",
+      "peerDependencies",
+    ]) {
+      const deps = packageJson[depKind];
+      for (const dep in deps) {
+        if (packageNames.includes(dep)) {
+          deps[dep] = VERSION;
+        }
+      }
+    }
+    await fs.writeFile(
+      pkgJsonPaths[pkg],
+      JSON.stringify(packageJson, null, 2) + "\n",
+      "utf8"
+    );
+  }
+}
+
+main();

.github/workflows/CI.yml

@@ -0,0 +1,72 @@
+name: CI
+
+on:
+  push:
+    branches: [main]
+    paths:
+      - 'packages/**'
+    # tags:
+    #   - '[0-9]+.[0-9]+.[0-9]+*'
+  pull_request:
+    branches: [main]
+    paths:
+      - 'packages/**'
+  workflow_dispatch:
+
+jobs:
+  build-publish:
+    name: Build and Publish to NPM
+    runs-on: ubuntu-latest
+    if: github.event_name == 'push' && github.repository == 'oscartbeaumont/rspc'
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+
+      - uses: pnpm/[email protected]
+        with:
+          version: latest
+
+      - uses: actions/setup-node@v3
+        with:
+          node-version: '16'
+          cache: 'pnpm'
+
+      - name: Setup npmrc
+        run: echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" > .npmrc
+
+      - name: Install dependencies
+        run: pnpm i --frozen-lockfile
+
+      - name: Generate test bindings
+        run: cargo test -p example tests::test_rspc_router -- --exact
+
+      - name: Typecheck
+        run: pnpm typecheck
+
+      - name: Build
+        run: pnpm build
+
+      - name: Configure main version
+        if: github.ref == 'refs/heads/main'
+        run: pnpm set-package-versions
+        env:
+          RELEASE_COMMIT_SHA: ${{ github.sha }}
+
+      - name: Publish main to npm
+        if: github.ref == 'refs/heads/main'
+        run: pnpm publish -r ${TAG} --no-git-checks --filter "@rspc/*" --access public
+        env:
+          TAG: ${{ (github.ref == 'refs/heads/main' && '--tag=main') || '' }}
+          # NPM_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
+
+      # - name: Configure release version
+      #   if: github.ref_type == 'tag'
+      #   run: pnpm set-package-versions
+
+      # - name: Publish release to npm
+      #   if: github.ref_type == 'tag'
+      #   run: pnpm publish -r ${TAG} --no-git-checks --filter "@rspc/*" --access public
+      #   env:
+      #     TAG: ${{ (contains(github.ref_name, '-beta.') && '--tag=beta') || ''}}
+      #     NPM_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}

.gitignore

@@ -1,6 +1,7 @@
 # Generated by Cargo
 # will have compiled files and executables
 target/
+test-target/
 
 # Remove Cargo.lock from gitignore if creating an executable, leave it for libraries
 # More information here https://doc.rust-lang.org/cargo/guide/cargo-toml-vs-cargo-lock.html
@@ -22,4 +23,7 @@ node_modules
 /packages/*/dist
 
 # Compiled vscode extension
-*.vsix
+*.vsix
+
+# Trybuild
+crates/*/wip

.taplo.toml

@@ -0,0 +1,2 @@
+[formatting]
+column_width = 150

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "rspc"
-description = "A blazing fast and easy to use TRPC server for Rust."
+description = "A blazingly fast and easy to use TRPC server for Rust."
 version = "0.1.2"
 authors = ["Oscar Beaumont <[email protected]>"]
 edition = "2021"
@@ -15,16 +15,18 @@ categories = ["web-programming", "asynchronous"]
 default = []
 tauri = ["dep:tauri"]
 tracing = ["dep:tracing"]
-httpz = ["dep:httpz", "httpz/tokio-ws"]
-# openapi = ["dep:openapiv3"]
+httpz = ["dep:httpz", "httpz/cookies"]
+openapi = ["dep:openapiv3", "dep:httpz", "dep:include_dir", "dep:mime_guess", "specta/openapi"]
 # playground = []
 
-# Webservers
-axum = ["httpz/axum"]
-# actix-web = ["httpz/actix-web"]
+# Webservers # Axum feature basically always enabled because we use the extractors regardless of webserver
+axum = ["httpz/axum", "httpz/tokio-ws", "httpz/axum"]
+actix-web = ["httpz/actix-web", "httpz/tokio-ws", "httpz/axum"]
 # poem = ["httpz/poem"]
-# rocket = ["httpz/rocket"]
+rocket = ["httpz/rocket", "httpz/tokio-ws", "httpz/axum"]
 # warp = ["httpz/warp"]
+lambda = ["httpz/lambda", "httpz/ws", "httpz/axum"]
+workers = ["httpz/workers", "httpz/ws"]
 
 # Specta
 uuid = ["specta/uuid"]
@@ -37,27 +39,34 @@ ipnetwork = ["specta/ipnetwork"]
 mac_address = ["specta/mac_address"]
 bit-vec = ["specta/bit-vec"]
 bson = ["specta/bson"]
+uhlc = ["specta/uhlc"]
 
 [dependencies]
-specta = { version = "0.0.4", path = "./specta", features = ["serde"] }
-httpz = { version = "0.0.3", optional = true }
-serde = { version = "1.0.145", features = ["derive"] }
-serde_json = "1.0.85"
-thiserror = "1.0.36"
-futures = "0.3.24"
-tokio = { version = "1.21.1", features = ["sync", "rt", "macros"] }
-tauri = { version = "1.1.1", optional = true }
-tracing = { version = "0.1.36", optional = true }
+specta = { version = "0.0.4", path = "./crates/specta", features = ["serde"] }
+httpz = { git = "https://github.com/oscartbeaumont/httpz.git", rev = "1ddbd9ad594ac7ee3e5b167afe689d1ce1228519", optional = true } # TODO: Move back to crates.io release
+serde = { version = "1.0.147", features = ["derive"] }
+serde_json = "1.0.87"
+thiserror = "1.0.37"
+futures = "0.3.25"
+tokio = { version = "1.21.2", features = ["sync", "rt", "macros"] }
+tauri = { version = "1.2.0", optional = true }
+tracing = { version = "0.1.37", optional = true }
 async-stream = "0.3.3"
+openapiv3 = { version = "1.0.1", optional = true }
+include_dir = { version = "0.7.3", optional = true, features = ["metadata"] }
+mime_guess = { version = "2.0.4", optional = true }
+worker = { version = "0.0.11", optional = true }
 
 [dev-dependencies]
 async-stream = "0.3.3"
 
 [workspace]
 members = [
-    "./create-rspc-app",
-    "./examples",
-    "./examples/axum",
-    "./specta",
-    "./specta/macros"
+  "./crates/normi",
+  "./crates/normi/macros",
+  "./crates/specta",
+  "./crates/specta/macros",
+  "./create-rspc-app",
+  "./examples",
+  "./examples/axum",
 ]

README.md

@@ -5,10 +5,10 @@
 <p align="center">🚧 Work in progress 🚧</p>
 <div align="center">
  <strong>
-   A blazing fast and easy to use TRPC-like server for Rust.
+   A blazingly fast and easy to use TRPC-like server for Rust.
  </strong>
 </div>
-<a align="center" href="https://rspc.otbeaumont.me">
+<a align="center" href="https://rspc.dev">
   <p>Website</p>
 </a>
 

crates/normi/Cargo.toml

@@ -0,0 +1,26 @@
+[package]
+name = "normi"
+description = "A normalised caching layer for rspc."
+version = "0.0.1"
+edition = "2021"
+
+[features]
+default = ["rspc"]
+rspc = ["dep:rspc"]
+
+[dependencies]
+rspc = { path = "../../", optional = true }
+normi-macros = { path = "./macros" }
+serde = "1.0.147"
+serde_json = "1.0.87"
+specta = { version = "0.0.4", path = "../specta" }
+
+[dev-dependencies]
+rspc = { path = "../../", features = ["axum"] }
+axum = "0.5.17"
+tokio = { version = "1.21.2", features = ["macros", "rt-multi-thread"] }
+tower-http = { version = "0.3.4", default-features = false, features = [
+  "cors",
+] }
+trybuild = "1.0.71"
+assert-json-diff = "2.0.2"