demostf/parser
1
0
Fork 0
mirror of https://codeberg.org/demostf/parser.git synced 2026-06-03 18:24:05 +02:00
Code Issues Releases Wiki Activity

schemars

Browse source
This commit is contained in:
Robin Appelman 2021-07-25 17:26:53 +02:00
commit 93b51bff70
29 changed files with 15360 additions and 2187 deletions
Download patch file Download diff file Expand all files Collapse all files

278
Cargo.lock generated
View file

@ -85,26 +85,20 @@ dependencies = [
"err-derive", "err-derive",
"memchr", "memchr",
"num-traits 0.2.14", "num-traits 0.2.14",
"schemars",
"serde", "serde",
"wasm-bindgen",
] ]
[[package]] [[package]]
name = "bitbuffer_derive" name = "bitbuffer_derive"
version = "0.10.0" version = "0.10.0"
dependencies = [ dependencies = [
"proc-macro2 1.0.28", "proc-macro2",
"quote 1.0.9", "quote",
"syn 1.0.74", "syn",
"syn_util", "syn_util",
] ]
[[package]]
name = "bumpalo"
version = "3.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9c59e7af012c713f529e7a3ee57ce9b31ddd858d4b512923602f74608b009631"
[[package]] [[package]]
name = "cc" name = "cc"
version = "1.0.69" version = "1.0.69"
@ -150,8 +144,8 @@ version = "0.1.20"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5e98e2ad1a782e33928b96fc3948e7c355e5af34ba4de7670fe8bac2a3b2006d" checksum = "5e98e2ad1a782e33928b96fc3948e7c355e5af34ba4de7670fe8bac2a3b2006d"
dependencies = [ dependencies = [
"quote 1.0.9", "quote",
"syn 1.0.74", "syn",
] ]
[[package]] [[package]]
@ -160,9 +154,9 @@ version = "2.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b"
dependencies = [ dependencies = [
"proc-macro2 1.0.28", "proc-macro2",
"quote 1.0.9", "quote",
"syn 1.0.74", "syn",
] ]
[[package]] [[package]]
@ -171,6 +165,12 @@ version = "0.1.12"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0e25ea47919b1560c4e3b7fe0aaab9becf5b84a10325ddf7db0f0ba5e1026499" checksum = "0e25ea47919b1560c4e3b7fe0aaab9becf5b84a10325ddf7db0f0ba5e1026499"
[[package]]
name = "dyn-clone"
version = "1.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ee2626afccd7561a06cf1367e2950c4718ea04565e20fb5029b6c7d8ad09abcf"
[[package]] [[package]]
name = "encode_unicode" name = "encode_unicode"
version = "0.3.6" version = "0.3.6"
@ -202,9 +202,9 @@ version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "33526f770a27828ce7c2792fdb7cb240220237e0ff12933ed6c23957fc5dd7cf" checksum = "33526f770a27828ce7c2792fdb7cb240220237e0ff12933ed6c23957fc5dd7cf"
dependencies = [ dependencies = [
"proc-macro2 1.0.28", "proc-macro2",
"quote 1.0.9", "quote",
"syn 1.0.74", "syn",
] ]
[[package]] [[package]]
@ -214,10 +214,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dcc7f65832b62ed38939f98966824eb6294911c3629b0e9a262bfb80836d9686" checksum = "dcc7f65832b62ed38939f98966824eb6294911c3629b0e9a262bfb80836d9686"
dependencies = [ dependencies = [
"proc-macro-error", "proc-macro-error",
"proc-macro2 1.0.28", "proc-macro2",
"quote 1.0.9", "quote",
"rustversion", "rustversion",
"syn 1.0.74", "syn",
"synstructure", "synstructure",
] ]
@ -293,15 +293,6 @@ version = "0.2.98"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "320cfe77175da3a483efed4bc0adc1968ca050b098ce4f2f1c13a56626128790" checksum = "320cfe77175da3a483efed4bc0adc1968ca050b098ce4f2f1c13a56626128790"
[[package]]
name = "log"
version = "0.4.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710"
dependencies = [
"cfg-if",
]
[[package]] [[package]]
name = "main_error" name = "main_error"
version = "0.1.1" version = "0.1.1"
@ -330,9 +321,9 @@ version = "0.1.15"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3b884e0f4a7a80970539a7757902675ce503d98615f5b564564b4bd0236f7f36" checksum = "3b884e0f4a7a80970539a7757902675ce503d98615f5b564564b4bd0236f7f36"
dependencies = [ dependencies = [
"proc-macro2 1.0.28", "proc-macro2",
"quote 1.0.9", "quote",
"syn 1.0.74", "syn",
] ]
[[package]] [[package]]
@ -437,9 +428,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b1def5a3f69d4707d8a040b12785b98029a39e8c610ae685c7f6265669767482" checksum = "b1def5a3f69d4707d8a040b12785b98029a39e8c610ae685c7f6265669767482"
dependencies = [ dependencies = [
"proc-macro-crate", "proc-macro-crate",
"proc-macro2 1.0.28", "proc-macro2",
"quote 1.0.9", "quote",
"syn 1.0.74", "syn",
] ]
[[package]] [[package]]
@ -484,12 +475,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ad30302271e65d661910580baf25e874cd92c4595ddbed74d1ec9b2fdfaae64b" checksum = "ad30302271e65d661910580baf25e874cd92c4595ddbed74d1ec9b2fdfaae64b"
dependencies = [ dependencies = [
"once_cell", "once_cell",
"proc-macro2 1.0.28", "proc-macro2",
"quote 1.0.9", "quote",
"regex", "regex",
"regex-syntax", "regex-syntax",
"structmeta", "structmeta",
"syn 1.0.74", "syn",
] ]
[[package]] [[package]]
@ -521,9 +512,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
dependencies = [ dependencies = [
"proc-macro-error-attr", "proc-macro-error-attr",
"proc-macro2 1.0.28", "proc-macro2",
"quote 1.0.9", "quote",
"syn 1.0.74", "syn",
"version_check", "version_check",
] ]
@ -533,36 +524,18 @@ version = "1.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
dependencies = [ dependencies = [
"proc-macro2 1.0.28", "proc-macro2",
"quote 1.0.9", "quote",
"version_check", "version_check",
] ]
[[package]]
name = "proc-macro2"
version = "0.4.30"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759"
dependencies = [
"unicode-xid 0.1.0",
]
[[package]] [[package]]
name = "proc-macro2" name = "proc-macro2"
version = "1.0.28" version = "1.0.28"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5c7ed8b8c7b886ea3ed7dde405212185f423ab44682667c8c6dd14aa1d9f6612" checksum = "5c7ed8b8c7b886ea3ed7dde405212185f423ab44682667c8c6dd14aa1d9f6612"
dependencies = [ dependencies = [
"unicode-xid 0.2.2", "unicode-xid",
]
[[package]]
name = "quote"
version = "0.6.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6ce23b6b870e8f94f81fb0a363d65d86675884b34a09043c81e5562f11c1f8e1"
dependencies = [
"proc-macro2 0.4.30",
] ]
[[package]] [[package]]
@ -571,7 +544,7 @@ version = "1.0.9"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7" checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7"
dependencies = [ dependencies = [
"proc-macro2 1.0.28", "proc-macro2",
] ]
[[package]] [[package]]
@ -609,6 +582,30 @@ version = "1.0.5"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e" checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e"
[[package]]
name = "schemars"
version = "0.8.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bc6ab463ae35acccb5cba66c0084c985257b797d288b6050cc2f6ac1b266cb78"
dependencies = [
"dyn-clone",
"schemars_derive",
"serde",
"serde_json",
]
[[package]]
name = "schemars_derive"
version = "0.8.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "902fdfbcf871ae8f653bddf4b2c05905ddaabc08f69d32a915787e3be0d31356"
dependencies = [
"proc-macro2",
"quote",
"serde_derive_internals",
"syn",
]
[[package]] [[package]]
name = "serde" name = "serde"
version = "1.0.126" version = "1.0.126"
@ -624,19 +621,20 @@ version = "1.0.126"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "963a7dbc9895aeac7ac90e74f34a5d5261828f79df35cbed41e10189d3804d43" checksum = "963a7dbc9895aeac7ac90e74f34a5d5261828f79df35cbed41e10189d3804d43"
dependencies = [ dependencies = [
"proc-macro2 1.0.28", "proc-macro2",
"quote 1.0.9", "quote",
"syn 1.0.74", "syn",
] ]
[[package]] [[package]]
name = "serde_derive_internals" name = "serde_derive_internals"
version = "0.24.1" version = "0.25.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8a80c6c0b1ebbcea4ec2c7e9e2e9fa197a425d17f1afec8ba79fcd1352b18ffb" checksum = "1dbab34ca63057a1f15280bdf3c39f2b1eb1b54c17e98360e511637aef7418c6"
dependencies = [ dependencies = [
"proc-macro2 0.4.30", "proc-macro2",
"syn 0.15.44", "quote",
"syn",
] ]
[[package]] [[package]]
@ -656,9 +654,9 @@ version = "0.1.7"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "98d0516900518c29efa217c298fa1f4e6c6ffc85ae29fd7f4ee48f176e1a9ed5" checksum = "98d0516900518c29efa217c298fa1f4e6c6ffc85ae29fd7f4ee48f176e1a9ed5"
dependencies = [ dependencies = [
"proc-macro2 1.0.28", "proc-macro2",
"quote 1.0.9", "quote",
"syn 1.0.74", "syn",
] ]
[[package]] [[package]]
@ -688,10 +686,10 @@ version = "0.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b55b4052fd036e3d1fe74ea978426a3f87997ba803e7a8e69ff0cf99f35a720a" checksum = "b55b4052fd036e3d1fe74ea978426a3f87997ba803e7a8e69ff0cf99f35a720a"
dependencies = [ dependencies = [
"proc-macro2 1.0.28", "proc-macro2",
"quote 1.0.9", "quote",
"structmeta-derive", "structmeta-derive",
"syn 1.0.74", "syn",
] ]
[[package]] [[package]]
@ -700,20 +698,9 @@ version = "0.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3f55502dda4b5fd26b33f6810d7493b4f5d7859bca604bd07ff22a523cd257ee" checksum = "3f55502dda4b5fd26b33f6810d7493b4f5d7859bca604bd07ff22a523cd257ee"
dependencies = [ dependencies = [
"proc-macro2 1.0.28", "proc-macro2",
"quote 1.0.9", "quote",
"syn 1.0.74", "syn",
]
[[package]]
name = "syn"
version = "0.15.44"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9ca4b3b69a77cbe1ffc9e198781b7acb0c7365a883670e8f1c1bc66fba79a5c5"
dependencies = [
"proc-macro2 0.4.30",
"quote 0.6.13",
"unicode-xid 0.1.0",
] ]
[[package]] [[package]]
@ -722,9 +709,9 @@ version = "1.0.74"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1873d832550d4588c3dbc20f01361ab00bfe741048f71e3fecf145a7cc18b29c" checksum = "1873d832550d4588c3dbc20f01361ab00bfe741048f71e3fecf145a7cc18b29c"
dependencies = [ dependencies = [
"proc-macro2 1.0.28", "proc-macro2",
"quote 1.0.9", "quote",
"unicode-xid 0.2.2", "unicode-xid",
] ]
[[package]] [[package]]
@ -733,9 +720,9 @@ version = "0.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6754c4559b79657554e9d8a0d56e65e490c76d382b9c23108364ec4125dea23c" checksum = "6754c4559b79657554e9d8a0d56e65e490c76d382b9c23108364ec4125dea23c"
dependencies = [ dependencies = [
"proc-macro2 1.0.28", "proc-macro2",
"quote 1.0.9", "quote",
"syn 1.0.74", "syn",
] ]
[[package]] [[package]]
@ -744,10 +731,10 @@ version = "0.12.5"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "474aaa926faa1603c40b7885a9eaea29b444d1cb2850cb7c0e37bb1a4182f4fa" checksum = "474aaa926faa1603c40b7885a9eaea29b444d1cb2850cb7c0e37bb1a4182f4fa"
dependencies = [ dependencies = [
"proc-macro2 1.0.28", "proc-macro2",
"quote 1.0.9", "quote",
"syn 1.0.74", "syn",
"unicode-xid 0.2.2", "unicode-xid",
] ]
[[package]] [[package]]
@ -766,9 +753,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3b114ece25254e97bf48dd4bfc2a12bad0647adacfe4cae1247a9ca6ad302cec" checksum = "3b114ece25254e97bf48dd4bfc2a12bad0647adacfe4cae1247a9ca6ad302cec"
dependencies = [ dependencies = [
"cfg-if", "cfg-if",
"proc-macro2 1.0.28", "proc-macro2",
"quote 1.0.9", "quote",
"syn 1.0.74", "syn",
"version_check", "version_check",
] ]
@ -789,14 +776,13 @@ dependencies = [
"num_enum", "num_enum",
"parse-display", "parse-display",
"pretty_assertions", "pretty_assertions",
"schemars",
"serde", "serde",
"serde_json", "serde_json",
"serde_repr", "serde_repr",
"snap", "snap",
"steamid-ng", "steamid-ng",
"test-case", "test-case",
"wasm-bindgen",
"wasm-typescript-definition",
] ]
[[package]] [[package]]
@ -814,9 +800,9 @@ version = "1.0.26"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "060d69a0afe7796bf42e9e2ff91f5ee691fb15c53d38b4b62a9a53eb23164745" checksum = "060d69a0afe7796bf42e9e2ff91f5ee691fb15c53d38b4b62a9a53eb23164745"
dependencies = [ dependencies = [
"proc-macro2 1.0.28", "proc-macro2",
"quote 1.0.9", "quote",
"syn 1.0.74", "syn",
] ]
[[package]] [[package]]
@ -828,12 +814,6 @@ dependencies = [
"serde", "serde",
] ]
[[package]]
name = "unicode-xid"
version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc"
[[package]] [[package]]
name = "unicode-xid" name = "unicode-xid"
version = "0.2.2" version = "0.2.2"
@ -846,74 +826,6 @@ version = "0.9.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5fecdca9a5291cc2b8dcf7dc02453fee791a280f3743cb0905f8822ae463b3fe" checksum = "5fecdca9a5291cc2b8dcf7dc02453fee791a280f3743cb0905f8822ae463b3fe"
[[package]]
name = "wasm-bindgen"
version = "0.2.74"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d54ee1d4ed486f78874278e63e4069fc1ab9f6a18ca492076ffb90c5eb2997fd"
dependencies = [
"cfg-if",
"wasm-bindgen-macro",
]
[[package]]
name = "wasm-bindgen-backend"
version = "0.2.74"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3b33f6a0694ccfea53d94db8b2ed1c3a8a4c86dd936b13b9f0a15ec4a451b900"
dependencies = [
"bumpalo",
"lazy_static",
"log",
"proc-macro2 1.0.28",
"quote 1.0.9",
"syn 1.0.74",
"wasm-bindgen-shared",
]
[[package]]
name = "wasm-bindgen-macro"
version = "0.2.74"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "088169ca61430fe1e58b8096c24975251700e7b1f6fd91cc9d59b04fb9b18bd4"
dependencies = [
"quote 1.0.9",
"wasm-bindgen-macro-support",
]
[[package]]
name = "wasm-bindgen-macro-support"
version = "0.2.74"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "be2241542ff3d9f241f5e2cb6dd09b37efe786df8851c54957683a49f0987a97"
dependencies = [
"proc-macro2 1.0.28",
"quote 1.0.9",
"syn 1.0.74",
"wasm-bindgen-backend",
"wasm-bindgen-shared",
]
[[package]]
name = "wasm-bindgen-shared"
version = "0.2.74"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d7cff876b8f18eed75a66cf49b65e7f967cb354a7aa16003fb55dbfd25b44b4f"
[[package]]
name = "wasm-typescript-definition"
version = "0.1.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d8465124a2881b8f87feab575a519c181c9801641d772d253fee64a0adbca2e5"
dependencies = [
"proc-macro2 0.4.30",
"quote 0.6.13",
"serde",
"serde_derive",
"serde_derive_internals",
"syn 0.15.44",
]
[[package]] [[package]]
name = "winapi" name = "winapi"
version = "0.3.9" version = "0.3.9"

10
Cargo.toml
View file

@ -20,6 +20,11 @@ path = "src/bin/main.rs"
name = "reencode_demo" name = "reencode_demo"
path = "src/bin/reencode.rs" path = "src/bin/reencode.rs"
[[bin]]
name = "schema"
path = "src/bin/schema.rs"
required-features = ["schema"]
[dependencies] [dependencies]
bitbuffer = { version = "0.10", features = ["serde"], path = "../../bitbuffer" } bitbuffer = { version = "0.10", features = ["serde"], path = "../../bitbuffer" }
num_enum = "0.5" num_enum = "0.5"
@ -37,11 +42,10 @@ better-panic = { version = "0.2", optional = true }
no-panic = { version = "0.1", optional = true } no-panic = { version = "0.1", optional = true }
fnv = "1" fnv = "1"
steamid-ng = "1" steamid-ng = "1"
wasm-bindgen = { version = "0.2", optional = true } schemars = { version = "0.8", optional = true }
wasm-typescript-definition = { version = "0.1", optional = true }
[features] [features]
wasm = ["wasm-bindgen", "bitbuffer/wasm-bindgen", "wasm-typescript-definition"] schema = ["schemars", "bitbuffer/schemars"]
[dev-dependencies] [dev-dependencies]
pretty_assertions = "0.7" pretty_assertions = "0.7"

17
codegen/src/gameevent.rs
View file

@ -230,8 +230,6 @@ pub fn generate_game_events(demo: Demo) -> TokenStream {
use crate::{ParseError, Result}; use crate::{ParseError, Result};
use bitbuffer::{BitRead, LittleEndian, BitWrite, BitWriteStream}; use bitbuffer::{BitRead, LittleEndian, BitWrite, BitWriteStream};
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
#[cfg(feature = "wasm")]
use wasm_bindgen::prelude::*;
); );
let event_definitions = events.iter().map(|event| { let event_definitions = events.iter().map(|event| {
@ -266,10 +264,7 @@ pub fn generate_game_events(demo: Demo) -> TokenStream {
}; };
quote!( quote!(
#[cfg_attr( #[cfg_attr(feature = "wasm", derive(schemars::JsonSchema))]
feature = "wasm",
derive(wasm_typescript_definition::TypescriptDefinition)
)]
#[derive(Debug, BitWrite, PartialEq, Serialize, Deserialize)] #[derive(Debug, BitWrite, PartialEq, Serialize, Deserialize)]
pub struct #name { pub struct #name {
#(#fields)* #(#fields)*
@ -386,20 +381,14 @@ pub fn generate_game_events(demo: Demo) -> TokenStream {
#(#event_definitions)* #(#event_definitions)*
#[cfg_attr( #[cfg_attr(feature = "wasm", derive(schemars::JsonSchema))]
feature = "wasm",
derive(wasm_typescript_definition::TypescriptDefinition)
)]
#[derive(Debug, PartialEq, Serialize, Deserialize)] #[derive(Debug, PartialEq, Serialize, Deserialize)]
pub enum GameEvent { pub enum GameEvent {
#(#event_variants)* #(#event_variants)*
Unknown(RawGameEvent), Unknown(RawGameEvent),
} }
#[cfg_attr( #[cfg_attr(feature = "wasm", derive(schemars::JsonSchema))]
feature = "wasm",
derive(wasm_typescript_definition::TypescriptDefinition)
)]
#[derive(Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)] #[derive(Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
pub enum GameEventType { pub enum GameEventType {
#(#event_types)* #(#event_types)*

14746
schema.json Normal file
View file

File diff suppressed because it is too large Load diff

7
src/bin/schema.rs Normal file
View file

@ -0,0 +1,7 @@
use schemars::schema_for;
use tf_demo_parser::demo::packet::Packet;
fn main() {
let schema = schema_for!(Packet);
println!("{}", serde_json::to_string_pretty(&schema).unwrap());
}

2019
src/demo/gameevent_gen.rs
View file

File diff suppressed because it is too large Load diff

27
src/demo/gamevent.rs
View file

@ -6,13 +6,8 @@ use bitbuffer::{BitRead, BitWrite, BitWriteStream, LittleEndian};
use parse_display::Display; use parse_display::Display;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use std::cmp::Ordering; use std::cmp::Ordering;
#[cfg(feature = "wasm")]
use wasm_bindgen::prelude::*;
#[cfg_attr( #[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
feature = "wasm",
derive(wasm_typescript_definition::TypescriptDefinition)
)]
#[derive(Debug, Clone, Serialize, Deserialize)] #[derive(Debug, Clone, Serialize, Deserialize)]
pub struct GameEventDefinition { pub struct GameEventDefinition {
pub id: GameEventTypeId, pub id: GameEventTypeId,
@ -40,20 +35,14 @@ impl Ord for GameEventDefinition {
} }
} }
#[cfg_attr( #[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
feature = "wasm",
derive(wasm_typescript_definition::TypescriptDefinition)
)]
#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)] #[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
pub struct GameEventEntry { pub struct GameEventEntry {
pub name: String, pub name: String,
pub kind: GameEventValueType, pub kind: GameEventValueType,
} }
#[cfg_attr( #[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
feature = "wasm",
derive(wasm_typescript_definition::TypescriptDefinition)
)]
#[derive(BitRead, BitWrite, Debug, Clone, Copy, PartialEq, Display, Serialize, Deserialize)] #[derive(BitRead, BitWrite, Debug, Clone, Copy, PartialEq, Display, Serialize, Deserialize)]
#[discriminant_bits = 3] #[discriminant_bits = 3]
pub enum GameEventValueType { pub enum GameEventValueType {
@ -67,10 +56,7 @@ pub enum GameEventValueType {
Local = 7, Local = 7,
} }
#[cfg_attr( #[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
feature = "wasm",
derive(wasm_typescript_definition::TypescriptDefinition)
)]
#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)] #[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
pub enum GameEventValue { pub enum GameEventValue {
String(String), String(String),
@ -171,10 +157,7 @@ impl EventValue for () {
} }
} }
#[cfg_attr( #[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
feature = "wasm",
derive(wasm_typescript_definition::TypescriptDefinition)
)]
#[derive(Debug, PartialEq, Serialize, Deserialize)] #[derive(Debug, PartialEq, Serialize, Deserialize)]
pub struct RawGameEvent { pub struct RawGameEvent {
pub event_type: GameEventType, pub event_type: GameEventType,

7
src/demo/header.rs
View file

@ -1,12 +1,7 @@
use bitbuffer::{BitRead, BitWrite}; use bitbuffer::{BitRead, BitWrite};
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
#[cfg(feature = "wasm")]
use wasm_bindgen::prelude::*;
#[cfg_attr( #[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
feature = "wasm",
derive(wasm_typescript_definition::TypescriptDefinition)
)]
#[derive(BitRead, BitWrite, Debug, PartialEq, Serialize, Deserialize)] #[derive(BitRead, BitWrite, Debug, PartialEq, Serialize, Deserialize)]
pub struct Header { pub struct Header {
#[size = 8] #[size = 8]

7
src/demo/message/bspdecal.rs
View file

@ -3,13 +3,8 @@ use crate::demo::vector::Vector;
use crate::{ReadResult, Stream}; use crate::{ReadResult, Stream};
use bitbuffer::{BitRead, BitWrite, BitWriteSized, BitWriteStream, LittleEndian}; use bitbuffer::{BitRead, BitWrite, BitWriteSized, BitWriteStream, LittleEndian};
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
#[cfg(feature = "wasm")]
use wasm_bindgen::prelude::*;
#[cfg_attr( #[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
feature = "wasm",
derive(wasm_typescript_definition::TypescriptDefinition)
)]
#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)] #[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
pub struct BSPDecalMessage { pub struct BSPDecalMessage {
pub position: Vector, pub position: Vector,

12
src/demo/message/classinfo.rs
View file

@ -4,13 +4,8 @@ use serde::{Deserialize, Serialize};
use crate::demo::message::stringtable::log_base2; use crate::demo::message::stringtable::log_base2;
use crate::{ReadResult, Stream}; use crate::{ReadResult, Stream};
use std::cmp::min; use std::cmp::min;
#[cfg(feature = "wasm")]
use wasm_bindgen::prelude::*;
#[cfg_attr( #[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
feature = "wasm",
derive(wasm_typescript_definition::TypescriptDefinition)
)]
#[derive(BitReadSized, BitWriteSized, Debug, PartialEq, Serialize, Deserialize)] #[derive(BitReadSized, BitWriteSized, Debug, PartialEq, Serialize, Deserialize)]
pub struct ClassInfoEntry { pub struct ClassInfoEntry {
#[size = "input_size"] #[size = "input_size"]
@ -19,10 +14,7 @@ pub struct ClassInfoEntry {
table_name: String, table_name: String,
} }
#[cfg_attr( #[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
feature = "wasm",
derive(wasm_typescript_definition::TypescriptDefinition)
)]
#[derive(Debug, PartialEq, Serialize, Deserialize)] #[derive(Debug, PartialEq, Serialize, Deserialize)]
pub struct ClassInfoMessage { pub struct ClassInfoMessage {
count: u16, count: u16,

14
src/demo/message/gameevent.rs
View file

@ -1,8 +1,6 @@
use bitbuffer::{BitRead, BitWrite, BitWriteSized, BitWriteStream, LittleEndian}; use bitbuffer::{BitRead, BitWrite, BitWriteSized, BitWriteStream, LittleEndian};
use parse_display::Display; use parse_display::Display;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
#[cfg(feature = "wasm")]
use wasm_bindgen::prelude::*;
use crate::demo::gameevent_gen::GameEventType; use crate::demo::gameevent_gen::GameEventType;
use crate::demo::gamevent::{ use crate::demo::gamevent::{
@ -11,10 +9,7 @@ use crate::demo::gamevent::{
use crate::demo::parser::{Encode, ParseBitSkip}; use crate::demo::parser::{Encode, ParseBitSkip};
use crate::{GameEventError, Parse, ParseError, ParserState, ReadResult, Result, Stream}; use crate::{GameEventError, Parse, ParseError, ParserState, ReadResult, Result, Stream};
#[cfg_attr( #[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
feature = "wasm",
derive(wasm_typescript_definition::TypescriptDefinition)
)]
#[derive(Debug, PartialEq, Serialize, Deserialize)] #[derive(Debug, PartialEq, Serialize, Deserialize)]
pub struct GameEventMessage { pub struct GameEventMessage {
pub event_type_id: GameEventTypeId, pub event_type_id: GameEventTypeId,
@ -121,7 +116,7 @@ impl ParseBitSkip<'_> for GameEventMessage {
} }
} }
#[cfg_attr(feature = "wasm", wasm_bindgen::prelude::wasm_bindgen)] #[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
#[derive( #[derive(
BitRead, BitRead,
BitWrite, BitWrite,
@ -151,10 +146,7 @@ impl From<GameEventTypeId> for u16 {
} }
} }
#[cfg_attr( #[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
feature = "wasm",
derive(wasm_typescript_definition::TypescriptDefinition)
)]
#[derive(Debug, PartialEq, Serialize, Deserialize)] #[derive(Debug, PartialEq, Serialize, Deserialize)]
pub struct GameEventListMessage { pub struct GameEventListMessage {
pub event_list: Vec<GameEventDefinition>, pub event_list: Vec<GameEventDefinition>,

69
src/demo/message/generated.rs
View file

@ -2,13 +2,8 @@ use crate::Stream;
/// Messages that consists only of primitives and string and can be derived /// Messages that consists only of primitives and string and can be derived
use bitbuffer::{BitRead, BitWrite, LittleEndian}; use bitbuffer::{BitRead, BitWrite, LittleEndian};
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
#[cfg(feature = "wasm")]
use wasm_bindgen::prelude::*;
#[cfg_attr( #[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
feature = "wasm",
derive(wasm_typescript_definition::TypescriptDefinition)
)]
#[derive(BitRead, BitWrite, Debug, PartialEq, Serialize, Deserialize)] #[derive(BitRead, BitWrite, Debug, PartialEq, Serialize, Deserialize)]
pub struct FileMessage { pub struct FileMessage {
pub transfer_id: u32, pub transfer_id: u32,
@ -16,10 +11,7 @@ pub struct FileMessage {
pub requested: bool, pub requested: bool,
} }
#[cfg_attr( #[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
feature = "wasm",
derive(wasm_typescript_definition::TypescriptDefinition)
)]
#[derive(BitRead, BitWrite, Debug, PartialEq, Serialize, Deserialize)] #[derive(BitRead, BitWrite, Debug, PartialEq, Serialize, Deserialize)]
pub struct NetTickMessage { pub struct NetTickMessage {
pub tick: u32, pub tick: u32,
@ -27,38 +19,26 @@ pub struct NetTickMessage {
pub std_dev: u16, pub std_dev: u16,
} }
#[cfg_attr( #[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
feature = "wasm",
derive(wasm_typescript_definition::TypescriptDefinition)
)]
#[derive(BitRead, BitWrite, Debug, PartialEq, Serialize, Deserialize)] #[derive(BitRead, BitWrite, Debug, PartialEq, Serialize, Deserialize)]
pub struct StringCmdMessage { pub struct StringCmdMessage {
pub command: String, pub command: String,
} }
#[cfg_attr( #[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
feature = "wasm",
derive(wasm_typescript_definition::TypescriptDefinition)
)]
#[derive(BitRead, BitWrite, Debug, PartialEq, Serialize, Deserialize)] #[derive(BitRead, BitWrite, Debug, PartialEq, Serialize, Deserialize)]
pub struct SignOnStateMessage { pub struct SignOnStateMessage {
pub state: u8, pub state: u8,
pub count: u32, pub count: u32,
} }
#[cfg_attr( #[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
feature = "wasm",
derive(wasm_typescript_definition::TypescriptDefinition)
)]
#[derive(BitRead, BitWrite, Debug, PartialEq, Serialize, Deserialize)] #[derive(BitRead, BitWrite, Debug, PartialEq, Serialize, Deserialize)]
pub struct PrintMessage { pub struct PrintMessage {
pub value: String, pub value: String,
} }
#[cfg_attr( #[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
feature = "wasm",
derive(wasm_typescript_definition::TypescriptDefinition)
)]
#[derive(BitRead, BitWrite, Debug, PartialEq, Serialize, Deserialize)] #[derive(BitRead, BitWrite, Debug, PartialEq, Serialize, Deserialize)]
pub struct ServerInfoMessage { pub struct ServerInfoMessage {
pub version: u16, pub version: u16,
@ -80,29 +60,20 @@ pub struct ServerInfoMessage {
pub replay: bool, pub replay: bool,
} }
#[cfg_attr( #[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
feature = "wasm",
derive(wasm_typescript_definition::TypescriptDefinition)
)]
#[derive(BitRead, BitWrite, Debug, PartialEq, Serialize, Deserialize)] #[derive(BitRead, BitWrite, Debug, PartialEq, Serialize, Deserialize)]
pub struct SetPauseMessage { pub struct SetPauseMessage {
pub pause: bool, pub pause: bool,
} }
#[cfg_attr( #[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
feature = "wasm",
derive(wasm_typescript_definition::TypescriptDefinition)
)]
#[derive(BitRead, BitWrite, Debug, PartialEq, Serialize, Deserialize)] #[derive(BitRead, BitWrite, Debug, PartialEq, Serialize, Deserialize)]
pub struct SetViewMessage { pub struct SetViewMessage {
#[size = 11] #[size = 11]
pub index: u16, pub index: u16,
} }
#[cfg_attr( #[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
feature = "wasm",
derive(wasm_typescript_definition::TypescriptDefinition)
)]
#[derive(BitRead, BitWrite, Debug, PartialEq, Serialize, Deserialize)] #[derive(BitRead, BitWrite, Debug, PartialEq, Serialize, Deserialize)]
pub struct FixAngleMessage { pub struct FixAngleMessage {
pub relative: bool, pub relative: bool,
@ -111,10 +82,7 @@ pub struct FixAngleMessage {
pub z: u16, pub z: u16,
} }
#[cfg_attr( #[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
feature = "wasm",
derive(wasm_typescript_definition::TypescriptDefinition)
)]
#[derive(BitRead, BitWrite, Debug, PartialEq, Serialize, Deserialize)] #[derive(BitRead, BitWrite, Debug, PartialEq, Serialize, Deserialize)]
#[endianness = "LittleEndian"] #[endianness = "LittleEndian"]
#[serde(bound(deserialize = "'a: 'static"))] #[serde(bound(deserialize = "'a: 'static"))]
@ -129,17 +97,14 @@ pub struct EntityMessage<'a> {
pub data: Stream<'a>, pub data: Stream<'a>,
} }
#[cfg_attr(feature = "wasm", wasm_bindgen::prelude::wasm_bindgen)] #[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
#[derive(BitRead, BitWrite, Debug, PartialEq, Serialize, Deserialize)] #[derive(BitRead, BitWrite, Debug, PartialEq, Serialize, Deserialize)]
pub struct PreFetchMessage { pub struct PreFetchMessage {
#[size = 14] #[size = 14]
pub index: u16, pub index: u16,
} }
#[cfg_attr( #[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
feature = "wasm",
derive(wasm_typescript_definition::TypescriptDefinition)
)]
#[derive(BitRead, BitWrite, Debug, PartialEq, Serialize, Deserialize)] #[derive(BitRead, BitWrite, Debug, PartialEq, Serialize, Deserialize)]
#[endianness = "LittleEndian"] #[endianness = "LittleEndian"]
#[serde(bound(deserialize = "'a: 'static"))] #[serde(bound(deserialize = "'a: 'static"))]
@ -150,20 +115,14 @@ pub struct MenuMessage<'a> {
pub index: Stream<'a>, pub index: Stream<'a>,
} }
#[cfg_attr( #[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
feature = "wasm",
derive(wasm_typescript_definition::TypescriptDefinition)
)]
#[derive(BitRead, BitWrite, Debug, PartialEq, Serialize, Deserialize)] #[derive(BitRead, BitWrite, Debug, PartialEq, Serialize, Deserialize)]
pub struct GetCvarValueMessage { pub struct GetCvarValueMessage {
pub cookie: u32, pub cookie: u32,
pub value: String, pub value: String,
} }
#[cfg_attr( #[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
feature = "wasm",
derive(wasm_typescript_definition::TypescriptDefinition)
)]
#[derive(BitRead, BitWrite, Debug, PartialEq, Serialize, Deserialize)] #[derive(BitRead, BitWrite, Debug, PartialEq, Serialize, Deserialize)]
#[endianness = "LittleEndian"] #[endianness = "LittleEndian"]
#[serde(bound(deserialize = "'a: 'static"))] #[serde(bound(deserialize = "'a: 'static"))]

12
src/demo/message/mod.rs
View file

@ -14,8 +14,6 @@ use crate::{Parse, ParserState, Result, Stream};
use bitbuffer::{BitRead, BitWrite, BitWriteStream, LittleEndian}; use bitbuffer::{BitRead, BitWrite, BitWriteStream, LittleEndian};
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use serde_repr::{Deserialize_repr, Serialize_repr}; use serde_repr::{Deserialize_repr, Serialize_repr};
#[cfg(feature = "wasm")]
use wasm_bindgen::prelude::*;
pub mod bspdecal; pub mod bspdecal;
pub mod classinfo; pub mod classinfo;
@ -28,10 +26,7 @@ pub mod tempentities;
pub mod usermessage; pub mod usermessage;
pub mod voice; pub mod voice;
#[cfg_attr( #[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
feature = "wasm",
derive(wasm_typescript_definition::TypescriptDefinition)
)]
#[derive( #[derive(
BitRead, BitWrite, Debug, Clone, Copy, PartialEq, Eq, Serialize_repr, Deserialize_repr, BitRead, BitWrite, Debug, Clone, Copy, PartialEq, Eq, Serialize_repr, Deserialize_repr,
)] )]
@ -68,10 +63,7 @@ pub enum MessageType {
CmdKeyValues = 32, CmdKeyValues = 32,
} }
#[cfg_attr( #[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
feature = "wasm",
derive(wasm_typescript_definition::TypescriptDefinition)
)]
#[derive(Debug, PartialEq, Serialize, Deserialize)] #[derive(Debug, PartialEq, Serialize, Deserialize)]
#[serde(bound(deserialize = "'a: 'static"))] #[serde(bound(deserialize = "'a: 'static"))]
pub enum Message<'a> { pub enum Message<'a> {

22
src/demo/message/packetentities.rs
View file

@ -13,13 +13,8 @@ use std::cmp::min;
use std::fmt; use std::fmt;
use std::hint::unreachable_unchecked; use std::hint::unreachable_unchecked;
use std::num::NonZeroU32; use std::num::NonZeroU32;
#[cfg(feature = "wasm")]
use wasm_bindgen::prelude::*;
#[cfg_attr( #[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
feature = "wasm",
derive(wasm_typescript_definition::TypescriptDefinition)
)]
#[derive( #[derive(
Debug, Debug,
Copy, Copy,
@ -43,10 +38,7 @@ impl From<u32> for EntityId {
} }
} }
#[cfg_attr( #[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
feature = "wasm",
derive(wasm_typescript_definition::TypescriptDefinition)
)]
#[derive( #[derive(
BitRead, BitWrite, Clone, Copy, Debug, PartialEq, Eq, Serialize_repr, Deserialize_repr, BitRead, BitWrite, Clone, Copy, Debug, PartialEq, Eq, Serialize_repr, Deserialize_repr,
)] )]
@ -59,10 +51,7 @@ pub enum PVS {
Delete = 3, Delete = 3,
} }
#[cfg_attr( #[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
feature = "wasm",
derive(wasm_typescript_definition::TypescriptDefinition)
)]
#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)] #[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
pub struct PacketEntity { pub struct PacketEntity {
pub server_class: ClassId, pub server_class: ClassId,
@ -188,10 +177,7 @@ fn test_bit_var_roundtrip() {
bit_var_normal(123456789); bit_var_normal(123456789);
} }
#[cfg_attr( #[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
feature = "wasm",
derive(wasm_typescript_definition::TypescriptDefinition)
)]
#[derive(Debug, PartialEq, Serialize, Deserialize)] #[derive(Debug, PartialEq, Serialize, Deserialize)]
pub struct PacketEntitiesMessage { pub struct PacketEntitiesMessage {
pub entities: Vec<PacketEntity>, pub entities: Vec<PacketEntity>,

12
src/demo/message/setconvar.rs
View file

@ -1,14 +1,9 @@
use bitbuffer::{BitRead, BitReadStream, BitWrite, BitWriteStream, Endianness}; use bitbuffer::{BitRead, BitReadStream, BitWrite, BitWriteStream, Endianness};
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
#[cfg(feature = "wasm")]
use wasm_bindgen::prelude::*;
use crate::ReadResult; use crate::ReadResult;
#[cfg_attr( #[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
feature = "wasm",
derive(wasm_typescript_definition::TypescriptDefinition)
)]
#[derive(Debug, BitWrite, PartialEq, Serialize, Deserialize)] #[derive(Debug, BitWrite, PartialEq, Serialize, Deserialize)]
pub struct ConVar { pub struct ConVar {
key: String, key: String,
@ -27,10 +22,7 @@ impl<E: Endianness> BitRead<'_, E> for ConVar {
} }
} }
#[cfg_attr( #[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
feature = "wasm",
derive(wasm_typescript_definition::TypescriptDefinition)
)]
#[derive(Debug, BitRead, PartialEq, Serialize, Deserialize)] #[derive(Debug, BitRead, PartialEq, Serialize, Deserialize)]
pub struct SetConVarMessage { pub struct SetConVarMessage {
length: u8, length: u8,

17
src/demo/message/stringtable.rs
View file

@ -13,23 +13,15 @@ use crate::demo::parser::{Encode, ParseBitSkip};
use crate::{Parse, ParseError, ParserState, ReadResult, Result, Stream}; use crate::{Parse, ParseError, ParserState, ReadResult, Result, Stream};
use std::borrow::Cow; use std::borrow::Cow;
use std::cmp::min; use std::cmp::min;
#[cfg(feature = "wasm")]
use wasm_bindgen::prelude::*;
#[cfg_attr( #[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
feature = "wasm",
derive(wasm_typescript_definition::TypescriptDefinition)
)]
#[derive(Debug, PartialEq, Serialize, Deserialize)] #[derive(Debug, PartialEq, Serialize, Deserialize)]
#[serde(bound(deserialize = "'a: 'static"))] #[serde(bound(deserialize = "'a: 'static"))]
pub struct CreateStringTableMessage<'a> { pub struct CreateStringTableMessage<'a> {
pub table: StringTable<'a>, pub table: StringTable<'a>,
} }
#[cfg_attr( #[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
feature = "wasm",
derive(wasm_typescript_definition::TypescriptDefinition)
)]
#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)] #[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
pub struct StringTableMeta { pub struct StringTableMeta {
pub max_entries: u16, pub max_entries: u16,
@ -245,10 +237,7 @@ fn test_create_string_table_roundtrip() {
); );
} }
#[cfg_attr( #[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
feature = "wasm",
derive(wasm_typescript_definition::TypescriptDefinition)
)]
#[derive(Debug, PartialEq, Serialize, Deserialize)] #[derive(Debug, PartialEq, Serialize, Deserialize)]
#[serde(bound(deserialize = "'a: 'static"))] #[serde(bound(deserialize = "'a: 'static"))]
pub struct UpdateStringTableMessage<'a> { pub struct UpdateStringTableMessage<'a> {

12
src/demo/message/tempentities.rs
View file

@ -8,22 +8,14 @@ use crate::Result;
use crate::{Parse, ParseError, ParserState, Stream}; use crate::{Parse, ParseError, ParserState, Stream};
use bitbuffer::{BitWrite, BitWriteSized, BitWriteStream, LittleEndian}; use bitbuffer::{BitWrite, BitWriteSized, BitWriteStream, LittleEndian};
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
#[cfg(feature = "wasm")]
use wasm_bindgen::prelude::*;
#[cfg_attr( #[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
feature = "wasm",
derive(wasm_typescript_definition::TypescriptDefinition)
)]
#[derive(Debug, PartialEq, Serialize, Deserialize)] #[derive(Debug, PartialEq, Serialize, Deserialize)]
pub struct TempEntitiesMessage { pub struct TempEntitiesMessage {
pub events: Vec<EventInfo>, pub events: Vec<EventInfo>,
} }
#[cfg_attr( #[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
feature = "wasm",
derive(wasm_typescript_definition::TypescriptDefinition)
)]
#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
pub struct EventInfo { pub struct EventInfo {
pub class_id: ClassId, pub class_id: ClassId,

53
src/demo/message/usermessage.rs
View file

@ -4,13 +4,8 @@ use serde::{Deserialize, Serialize};
use crate::demo::handle_utf8_error; use crate::demo::handle_utf8_error;
use crate::{ReadResult, Stream}; use crate::{ReadResult, Stream};
#[cfg(feature = "wasm")]
use wasm_bindgen::prelude::*;
#[cfg_attr( #[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
feature = "wasm",
derive(wasm_typescript_definition::TypescriptDefinition)
)]
#[derive(BitRead, BitWrite, Clone, Copy, Debug, PartialEq, Eq, Serialize, Deserialize)] #[derive(BitRead, BitWrite, Clone, Copy, Debug, PartialEq, Eq, Serialize, Deserialize)]
#[repr(u8)] #[repr(u8)]
#[discriminant_bits = 8] #[discriminant_bits = 8]
@ -76,10 +71,7 @@ pub enum UserMessageType {
Unknown = 255, Unknown = 255,
} }
#[cfg_attr( #[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
feature = "wasm",
derive(wasm_typescript_definition::TypescriptDefinition)
)]
#[derive(Debug, PartialEq, Serialize, Deserialize)] #[derive(Debug, PartialEq, Serialize, Deserialize)]
#[serde(bound(deserialize = "'a: 'static"))] #[serde(bound(deserialize = "'a: 'static"))]
pub enum UserMessage<'a> { pub enum UserMessage<'a> {
@ -169,10 +161,7 @@ fn test_user_message_roundtrip() {
}))); })));
} }
#[cfg_attr( #[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
feature = "wasm",
derive(wasm_typescript_definition::TypescriptDefinition)
)]
#[derive(Debug, Clone, Copy, Serialize, Deserialize, PartialEq)] #[derive(Debug, Clone, Copy, Serialize, Deserialize, PartialEq)]
pub enum ChatMessageKind { pub enum ChatMessageKind {
#[serde(rename = "TF_Chat_All")] #[serde(rename = "TF_Chat_All")]
@ -219,10 +208,7 @@ impl BitWrite<LittleEndian> for ChatMessageKind {
} }
} }
#[cfg_attr( #[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
feature = "wasm",
derive(wasm_typescript_definition::TypescriptDefinition)
)]
#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)] #[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
pub struct SayText2Message { pub struct SayText2Message {
pub client: u8, pub client: u8,
@ -331,10 +317,7 @@ fn test_say_text2_roundtrip() {
}); });
} }
#[cfg_attr( #[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
feature = "wasm",
derive(wasm_typescript_definition::TypescriptDefinition)
)]
#[derive(BitRead, BitWrite, Debug, Clone, PartialEq, Serialize, Deserialize)] #[derive(BitRead, BitWrite, Debug, Clone, PartialEq, Serialize, Deserialize)]
#[discriminant_bits = 8] #[discriminant_bits = 8]
pub enum HudTextLocation { pub enum HudTextLocation {
@ -344,10 +327,7 @@ pub enum HudTextLocation {
PrintCenter, PrintCenter,
} }
#[cfg_attr( #[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
feature = "wasm",
derive(wasm_typescript_definition::TypescriptDefinition)
)]
#[derive(BitRead, BitWrite, Debug, Clone, PartialEq, Serialize, Deserialize)] #[derive(BitRead, BitWrite, Debug, Clone, PartialEq, Serialize, Deserialize)]
pub struct TextMessage { pub struct TextMessage {
pub location: HudTextLocation, pub location: HudTextLocation,
@ -355,24 +335,19 @@ pub struct TextMessage {
pub substitute: [String; 4], pub substitute: [String; 4],
} }
#[cfg_attr( #[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
feature = "wasm",
derive(wasm_typescript_definition::TypescriptDefinition)
)]
#[derive(BitRead, BitWrite, Debug, Clone, PartialEq, Serialize, Deserialize)] #[derive(BitRead, BitWrite, Debug, Clone, PartialEq, Serialize, Deserialize)]
pub struct ResetHudMessage { pub struct ResetHudMessage {
pub data: u8, pub data: u8,
} }
#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
#[derive(BitRead, BitWrite, Debug, Clone, PartialEq, Serialize, Deserialize)] #[derive(BitRead, BitWrite, Debug, Clone, PartialEq, Serialize, Deserialize)]
pub struct TrainMessage { pub struct TrainMessage {
pub data: u8, pub data: u8,
} }
#[cfg_attr( #[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
feature = "wasm",
derive(wasm_typescript_definition::TypescriptDefinition)
)]
#[derive(BitRead, BitWrite, Debug, Clone, PartialEq, Serialize, Deserialize)] #[derive(BitRead, BitWrite, Debug, Clone, PartialEq, Serialize, Deserialize)]
pub struct VoiceSubtitleMessage { pub struct VoiceSubtitleMessage {
client: u8, client: u8,
@ -380,10 +355,7 @@ pub struct VoiceSubtitleMessage {
item: u8, item: u8,
} }
#[cfg_attr( #[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
feature = "wasm",
derive(wasm_typescript_definition::TypescriptDefinition)
)]
#[derive(BitRead, BitWrite, Debug, Clone, PartialEq, Serialize, Deserialize)] #[derive(BitRead, BitWrite, Debug, Clone, PartialEq, Serialize, Deserialize)]
pub struct ShakeMessage { pub struct ShakeMessage {
command: u8, command: u8,
@ -392,10 +364,7 @@ pub struct ShakeMessage {
duration: f32, duration: f32,
} }
#[cfg_attr( #[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
feature = "wasm",
derive(wasm_typescript_definition::TypescriptDefinition)
)]
#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)] #[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
#[serde(bound(deserialize = "'a: 'static"))] #[serde(bound(deserialize = "'a: 'static"))]
pub struct UnknownUserMessage<'a> { pub struct UnknownUserMessage<'a> {

17
src/demo/message/voice.rs
View file

@ -1,14 +1,9 @@
use bitbuffer::{BitRead, BitWrite, BitWriteSized, BitWriteStream, LittleEndian}; use bitbuffer::{BitRead, BitWrite, BitWriteSized, BitWriteStream, LittleEndian};
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
#[cfg(feature = "wasm")]
use wasm_bindgen::prelude::*;
use crate::{ReadResult, Stream}; use crate::{ReadResult, Stream};
#[cfg_attr( #[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
feature = "wasm",
derive(wasm_typescript_definition::TypescriptDefinition)
)]
#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)] #[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
pub struct VoiceInitMessage { pub struct VoiceInitMessage {
codec: String, codec: String,
@ -64,10 +59,7 @@ fn test_voice_init_roundtrip() {
}); });
} }
#[cfg_attr( #[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
feature = "wasm",
derive(wasm_typescript_definition::TypescriptDefinition)
)]
#[derive(BitRead, BitWrite, Debug, Clone, PartialEq, Serialize, Deserialize)] #[derive(BitRead, BitWrite, Debug, Clone, PartialEq, Serialize, Deserialize)]
#[endianness = "LittleEndian"] #[endianness = "LittleEndian"]
#[serde(bound(deserialize = "'a: 'static"))] #[serde(bound(deserialize = "'a: 'static"))]
@ -79,10 +71,7 @@ pub struct VoiceDataMessage<'a> {
data: Stream<'a>, data: Stream<'a>,
} }
#[cfg_attr( #[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
feature = "wasm",
derive(wasm_typescript_definition::TypescriptDefinition)
)]
#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)] #[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
#[serde(bound(deserialize = "'a: 'static"))] #[serde(bound(deserialize = "'a: 'static"))]
pub struct ParseSoundsMessage<'a> { pub struct ParseSoundsMessage<'a> {

7
src/demo/packet/consolecmd.rs
View file

@ -1,13 +1,8 @@
use crate::{ReadResult, Stream}; use crate::{ReadResult, Stream};
use bitbuffer::{BitRead, BitWrite, LittleEndian}; use bitbuffer::{BitRead, BitWrite, LittleEndian};
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
#[cfg(feature = "wasm")]
use wasm_bindgen::prelude::*;
#[cfg_attr( #[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
feature = "wasm",
derive(wasm_typescript_definition::TypescriptDefinition)
)]
#[derive(Debug, PartialEq, Serialize, Deserialize)] #[derive(Debug, PartialEq, Serialize, Deserialize)]
pub struct ConsoleCmdPacket { pub struct ConsoleCmdPacket {
pub tick: u32, pub tick: u32,

37
src/demo/packet/datatable.rs
View file

@ -9,13 +9,8 @@ use serde::{Deserialize, Serialize};
use std::cmp::min; use std::cmp::min;
use std::convert::TryFrom; use std::convert::TryFrom;
use std::iter::once; use std::iter::once;
#[cfg(feature = "wasm")]
use wasm_bindgen::prelude::*;
#[cfg_attr( #[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
feature = "wasm",
derive(wasm_typescript_definition::TypescriptDefinition)
)]
#[derive( #[derive(
BitRead, BitRead,
BitWrite, BitWrite,
@ -52,10 +47,7 @@ impl From<ClassId> for u16 {
} }
} }
#[cfg_attr( #[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
feature = "wasm",
derive(wasm_typescript_definition::TypescriptDefinition)
)]
#[derive(BitRead, BitWrite, PartialEq, Eq, Hash, Debug, Serialize, Deserialize, Clone, Display)] #[derive(BitRead, BitWrite, PartialEq, Eq, Hash, Debug, Serialize, Deserialize, Clone, Display)]
pub struct ServerClassName(String); pub struct ServerClassName(String);
@ -77,10 +69,7 @@ impl From<&str> for ServerClassName {
} }
} }
#[cfg_attr( #[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
feature = "wasm",
derive(wasm_typescript_definition::TypescriptDefinition)
)]
#[derive(BitRead, BitWrite, Debug, Clone, PartialEq, Serialize, Deserialize)] #[derive(BitRead, BitWrite, Debug, Clone, PartialEq, Serialize, Deserialize)]
pub struct ServerClass { pub struct ServerClass {
pub id: ClassId, pub id: ClassId,
@ -88,10 +77,7 @@ pub struct ServerClass {
pub data_table: SendTableName, pub data_table: SendTableName,
} }
#[cfg_attr( #[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
feature = "wasm",
derive(wasm_typescript_definition::TypescriptDefinition)
)]
#[derive( #[derive(
BitRead, BitRead,
BitWrite, BitWrite,
@ -127,10 +113,7 @@ impl From<&str> for SendTableName {
} }
} }
#[cfg_attr( #[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
feature = "wasm",
derive(wasm_typescript_definition::TypescriptDefinition)
)]
#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)] #[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
pub struct ParseSendTable { pub struct ParseSendTable {
pub name: SendTableName, pub name: SendTableName,
@ -353,10 +336,7 @@ impl ParseSendTable {
} }
} }
#[cfg_attr( #[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
feature = "wasm",
derive(wasm_typescript_definition::TypescriptDefinition)
)]
#[derive(Debug, Clone, Serialize, Deserialize)] #[derive(Debug, Clone, Serialize, Deserialize)]
pub struct SendTable { pub struct SendTable {
pub name: SendTableName, pub name: SendTableName,
@ -365,10 +345,7 @@ pub struct SendTable {
pub flattened_props: Vec<SendPropDefinition>, pub flattened_props: Vec<SendPropDefinition>,
} }
#[cfg_attr( #[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
feature = "wasm",
derive(wasm_typescript_definition::TypescriptDefinition)
)]
#[derive(Debug, PartialEq, Serialize, Deserialize)] #[derive(Debug, PartialEq, Serialize, Deserialize)]
pub struct DataTablePacket { pub struct DataTablePacket {
pub tick: u32, pub tick: u32,

17
src/demo/packet/message.rs
View file

@ -5,13 +5,8 @@ use crate::demo::message::{Message, MessageType};
use crate::demo::parser::Encode; use crate::demo::parser::Encode;
use crate::demo::vector::Vector; use crate::demo::vector::Vector;
use crate::{Parse, ParserState, ReadResult, Result, Stream}; use crate::{Parse, ParserState, ReadResult, Result, Stream};
#[cfg(feature = "wasm")]
use wasm_bindgen::prelude::*;
#[cfg_attr( #[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
feature = "wasm",
derive(wasm_typescript_definition::TypescriptDefinition)
)]
#[derive(Debug, BitRead, BitWrite, PartialEq, Serialize, Deserialize)] #[derive(Debug, BitRead, BitWrite, PartialEq, Serialize, Deserialize)]
pub struct MessagePacketMeta { pub struct MessagePacketMeta {
pub flags: u32, // TODO pub flags: u32, // TODO
@ -20,10 +15,7 @@ pub struct MessagePacketMeta {
pub sequence_out: u32, pub sequence_out: u32,
} }
#[cfg_attr( #[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
feature = "wasm",
derive(wasm_typescript_definition::TypescriptDefinition)
)]
#[derive(Debug, PartialEq, Serialize, Deserialize)] #[derive(Debug, PartialEq, Serialize, Deserialize)]
#[serde(bound(deserialize = "'a: 'static"))] #[serde(bound(deserialize = "'a: 'static"))]
pub struct MessagePacket<'a> { pub struct MessagePacket<'a> {
@ -32,10 +24,7 @@ pub struct MessagePacket<'a> {
pub meta: MessagePacketMeta, pub meta: MessagePacketMeta,
} }
#[cfg_attr( #[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
feature = "wasm",
derive(wasm_typescript_definition::TypescriptDefinition)
)]
#[derive(Clone, Debug, PartialEq, Default, Serialize, Deserialize)] #[derive(Clone, Debug, PartialEq, Default, Serialize, Deserialize)]
pub struct ViewAngles { pub struct ViewAngles {
pub origin: (Vector, Vector), pub origin: (Vector, Vector),

12
src/demo/packet/mod.rs
View file

@ -19,13 +19,8 @@ pub mod stop;
pub mod stringtable; pub mod stringtable;
pub mod synctick; pub mod synctick;
pub mod usercmd; pub mod usercmd;
#[cfg(feature = "wasm")]
use wasm_bindgen::prelude::*;
#[cfg_attr( #[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
feature = "wasm",
derive(wasm_typescript_definition::TypescriptDefinition)
)]
#[derive(Debug, PartialEq, Serialize, Deserialize)] #[derive(Debug, PartialEq, Serialize, Deserialize)]
#[serde(bound(deserialize = "'a: 'static"))] #[serde(bound(deserialize = "'a: 'static"))]
pub enum Packet<'a> { pub enum Packet<'a> {
@ -54,10 +49,7 @@ impl Packet<'_> {
} }
} }
#[cfg_attr( #[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
feature = "wasm",
derive(wasm_typescript_definition::TypescriptDefinition)
)]
#[derive(BitRead, BitWrite, Debug, Clone, Copy, Eq, PartialEq)] #[derive(BitRead, BitWrite, Debug, Clone, Copy, Eq, PartialEq)]
#[discriminant_bits = 8] #[discriminant_bits = 8]
#[repr(u8)] #[repr(u8)]

7
src/demo/packet/stop.rs
View file

@ -1,12 +1,7 @@
use bitbuffer::{BitRead, BitWrite}; use bitbuffer::{BitRead, BitWrite};
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
#[cfg(feature = "wasm")]
use wasm_bindgen::prelude::*;
#[cfg_attr( #[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
feature = "wasm",
derive(wasm_typescript_definition::TypescriptDefinition)
)]
#[derive(Debug, BitRead, BitWrite, PartialEq, Serialize, Deserialize)] #[derive(Debug, BitRead, BitWrite, PartialEq, Serialize, Deserialize)]
pub struct StopPacket { pub struct StopPacket {
#[size = 24] #[size = 24]

27
src/demo/packet/stringtable.rs
View file

@ -7,13 +7,8 @@ use crate::demo::parser::Encode;
use crate::{Parse, ParseError, ParserState, ReadResult, Result, Stream}; use crate::{Parse, ParseError, ParserState, ReadResult, Result, Stream};
use std::borrow::{Borrow, Cow}; use std::borrow::{Borrow, Cow};
use std::cmp::min; use std::cmp::min;
#[cfg(feature = "wasm")]
use wasm_bindgen::prelude::*;
#[cfg_attr( #[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
feature = "wasm",
derive(wasm_typescript_definition::TypescriptDefinition)
)]
#[derive(BitRead, BitWrite, Clone, Copy, Debug, PartialEq, Serialize, Deserialize)] #[derive(BitRead, BitWrite, Clone, Copy, Debug, PartialEq, Serialize, Deserialize)]
pub struct FixedUserDataSize { pub struct FixedUserDataSize {
#[size = 12] #[size = 12]
@ -22,10 +17,7 @@ pub struct FixedUserDataSize {
pub bits: u8, pub bits: u8,
} }
#[cfg_attr( #[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
feature = "wasm",
derive(wasm_typescript_definition::TypescriptDefinition)
)]
#[derive(Debug, Serialize, Deserialize)] #[derive(Debug, Serialize, Deserialize)]
#[serde(bound(deserialize = "'a: 'static"))] #[serde(bound(deserialize = "'a: 'static"))]
pub struct StringTable<'a> { pub struct StringTable<'a> {
@ -155,10 +147,7 @@ fn test_string_table_roundtrip() {
}); });
} }
#[cfg_attr( #[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
feature = "wasm",
derive(wasm_typescript_definition::TypescriptDefinition)
)]
#[derive(BitRead, BitWrite, Clone, Debug, PartialEq, Serialize, Deserialize)] #[derive(BitRead, BitWrite, Clone, Debug, PartialEq, Serialize, Deserialize)]
#[endianness = "LittleEndian"] #[endianness = "LittleEndian"]
#[serde(bound(deserialize = "'a: 'static"))] #[serde(bound(deserialize = "'a: 'static"))]
@ -175,10 +164,7 @@ impl<'a> ExtraData<'a> {
} }
} }
#[cfg_attr( #[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
feature = "wasm",
derive(wasm_typescript_definition::TypescriptDefinition)
)]
#[derive(Clone, Default, PartialEq, Serialize, Deserialize)] #[derive(Clone, Default, PartialEq, Serialize, Deserialize)]
#[serde(bound(deserialize = "'a: 'static"))] #[serde(bound(deserialize = "'a: 'static"))]
pub struct StringTableEntry<'a> { pub struct StringTableEntry<'a> {
@ -229,10 +215,7 @@ impl fmt::Debug for StringTableEntry<'_> {
} }
} }
#[cfg_attr( #[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
feature = "wasm",
derive(wasm_typescript_definition::TypescriptDefinition)
)]
#[derive(Debug, PartialEq, Serialize, Deserialize)] #[derive(Debug, PartialEq, Serialize, Deserialize)]
#[serde(bound(deserialize = "'a: 'static"))] #[serde(bound(deserialize = "'a: 'static"))]
pub struct StringTablePacket<'a> { pub struct StringTablePacket<'a> {

7
src/demo/packet/synctick.rs
View file

@ -1,12 +1,7 @@
use bitbuffer::{BitRead, BitWrite}; use bitbuffer::{BitRead, BitWrite};
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
#[cfg(feature = "wasm")]
use wasm_bindgen::prelude::*;
#[cfg_attr( #[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
feature = "wasm",
derive(wasm_typescript_definition::TypescriptDefinition)
)]
#[derive(BitRead, BitWrite, Debug, PartialEq, Serialize, Deserialize)] #[derive(BitRead, BitWrite, Debug, PartialEq, Serialize, Deserialize)]
pub struct SyncTickPacket { pub struct SyncTickPacket {
pub tick: u32, pub tick: u32,

13
src/demo/packet/usercmd.rs
View file

@ -1,12 +1,7 @@
use bitbuffer::{BitRead, BitReadStream, BitWrite, BitWriteStream, LittleEndian}; use bitbuffer::{BitRead, BitReadStream, BitWrite, BitWriteStream, LittleEndian};
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
#[cfg(feature = "wasm")]
use wasm_bindgen::prelude::*;
#[cfg_attr( #[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
feature = "wasm",
derive(wasm_typescript_definition::TypescriptDefinition)
)]
#[derive(Debug, PartialEq, Serialize, Deserialize)] #[derive(Debug, PartialEq, Serialize, Deserialize)]
pub struct UserCmdPacket { pub struct UserCmdPacket {
pub tick: u32, pub tick: u32,
@ -37,10 +32,7 @@ impl BitWrite<LittleEndian> for UserCmdPacket {
} }
} }
#[cfg_attr( #[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
feature = "wasm",
derive(wasm_typescript_definition::TypescriptDefinition)
)]
#[derive(Debug, PartialEq, BitRead, BitWrite, Serialize, Deserialize)] #[derive(Debug, PartialEq, BitRead, BitWrite, Serialize, Deserialize)]
pub struct UserCmd { pub struct UserCmd {
command_number: Option<u32>, command_number: Option<u32>,
@ -54,6 +46,7 @@ pub struct UserCmd {
mouse_dy: Option<u16>, mouse_dy: Option<u16>,
} }
#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
#[derive(Debug, PartialEq, BitRead, BitWrite, Serialize, Deserialize)] #[derive(Debug, PartialEq, BitRead, BitWrite, Serialize, Deserialize)]
pub struct WeaponSelect { pub struct WeaponSelect {
#[size = 11] #[size = 11]

50
src/demo/sendprop.rs
View file

@ -17,9 +17,8 @@ use std::convert::{TryFrom, TryInto};
use std::fmt; use std::fmt;
use std::hash::Hash; use std::hash::Hash;
use std::ops::BitOr; use std::ops::BitOr;
#[cfg(feature = "wasm")]
use wasm_bindgen::prelude::*;
#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
#[derive( #[derive(
BitRead, BitRead,
BitWrite, BitWrite,
@ -60,10 +59,7 @@ impl From<&str> for SendPropName {
} }
} }
#[cfg_attr( #[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
feature = "wasm",
derive(wasm_typescript_definition::TypescriptDefinition)
)]
#[derive(Debug, Clone, Serialize, Deserialize)] #[derive(Debug, Clone, Serialize, Deserialize)]
pub struct RawSendPropDefinition { pub struct RawSendPropDefinition {
pub prop_type: SendPropType, pub prop_type: SendPropType,
@ -258,6 +254,7 @@ impl BitWrite<LittleEndian> for RawSendPropDefinition {
} }
} }
#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
#[derive(BitRead, BitWrite, Copy, Clone, PartialEq, Debug, Display, Serialize, Deserialize)] #[derive(BitRead, BitWrite, Copy, Clone, PartialEq, Debug, Display, Serialize, Deserialize)]
#[discriminant_bits = 5] #[discriminant_bits = 5]
pub enum SendPropType { pub enum SendPropType {
@ -319,6 +316,17 @@ pub enum SendPropFlag {
#[derive(Debug, Copy, Clone, PartialEq, Default, Serialize, Deserialize)] #[derive(Debug, Copy, Clone, PartialEq, Default, Serialize, Deserialize)]
pub struct SendPropFlags(BitFlags<SendPropFlag>); pub struct SendPropFlags(BitFlags<SendPropFlag>);
#[cfg(feature = "schemars")]
impl schemars::JsonSchema for SendPropFlags {
fn schema_name() -> String {
"SendPropFlags".into()
}
fn json_schema(gen: &mut schemars::gen::SchemaGenerator) -> schemars::schema::Schema {
u16::json_schema(gen)
}
}
impl BitOr<SendPropFlag> for SendPropFlags { impl BitOr<SendPropFlag> for SendPropFlags {
type Output = SendPropFlags; type Output = SendPropFlags;
@ -362,10 +370,7 @@ impl BitWrite<LittleEndian> for SendPropFlags {
} }
} }
#[cfg_attr( #[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
feature = "wasm",
derive(wasm_typescript_definition::TypescriptDefinition)
)]
#[derive(Debug, Clone, Serialize, Deserialize)] #[derive(Debug, Clone, Serialize, Deserialize)]
pub enum FloatDefinition { pub enum FloatDefinition {
Coord, Coord,
@ -408,10 +413,7 @@ impl FloatDefinition {
} }
} }
#[cfg_attr( #[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
feature = "wasm",
derive(wasm_typescript_definition::TypescriptDefinition)
)]
#[derive(Debug, Clone, Serialize, Deserialize)] #[derive(Debug, Clone, Serialize, Deserialize)]
pub struct SendPropDefinition { pub struct SendPropDefinition {
pub identifier: SendPropIdentifier, pub identifier: SendPropIdentifier,
@ -430,10 +432,7 @@ impl TryFrom<&RawSendPropDefinition> for SendPropDefinition {
} }
} }
#[cfg_attr( #[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
feature = "wasm",
derive(wasm_typescript_definition::TypescriptDefinition)
)]
#[derive(Debug, Clone, Serialize, Deserialize)] #[derive(Debug, Clone, Serialize, Deserialize)]
pub enum SendPropParseDefinition { pub enum SendPropParseDefinition {
NormalVarInt { NormalVarInt {
@ -561,10 +560,7 @@ impl TryFrom<&RawSendPropDefinition> for SendPropParseDefinition {
} }
} }
#[cfg_attr( #[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
feature = "wasm",
derive(wasm_typescript_definition::TypescriptDefinition)
)]
#[derive(Debug, Clone, Serialize, Deserialize)] #[derive(Debug, Clone, Serialize, Deserialize)]
#[serde(untagged)] #[serde(untagged)]
pub enum SendPropValue { pub enum SendPropValue {
@ -1090,10 +1086,7 @@ impl<'a> TryFrom<&'a SendPropValue> for &'a [SendPropValue] {
} }
} }
#[cfg_attr( #[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
feature = "wasm",
derive(wasm_typescript_definition::TypescriptDefinition)
)]
#[derive( #[derive(
Debug, Clone, Copy, Ord, PartialOrd, Eq, PartialEq, Hash, Display, Serialize, Deserialize, Debug, Clone, Copy, Ord, PartialOrd, Eq, PartialEq, Hash, Display, Serialize, Deserialize,
)] )]
@ -1112,10 +1105,7 @@ impl From<u64> for SendPropIdentifier {
} }
} }
#[cfg_attr( #[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
feature = "wasm",
derive(wasm_typescript_definition::TypescriptDefinition)
)]
#[derive(Debug, Clone, Display, PartialEq, Serialize, Deserialize)] #[derive(Debug, Clone, Display, PartialEq, Serialize, Deserialize)]
#[display("{index} = {value}")] #[display("{index} = {value}")]
pub struct SendProp { pub struct SendProp {

12
src/demo/vector.rs
View file

@ -1,13 +1,8 @@
use bitbuffer::{BitRead, BitWrite}; use bitbuffer::{BitRead, BitWrite};
use parse_display::Display; use parse_display::Display;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
#[cfg(feature = "wasm")]
use wasm_bindgen::prelude::*;
#[cfg_attr( #[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
feature = "wasm",
derive(wasm_typescript_definition::TypescriptDefinition)
)]
#[derive(BitRead, BitWrite, Debug, Clone, Copy, Default, Serialize, Deserialize, Display)] #[derive(BitRead, BitWrite, Debug, Clone, Copy, Default, Serialize, Deserialize, Display)]
#[display("({x}, {y}, {z})")] #[display("({x}, {y}, {z})")]
pub struct Vector { pub struct Vector {
@ -22,10 +17,7 @@ impl PartialEq for Vector {
} }
} }
#[cfg_attr( #[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
feature = "wasm",
derive(wasm_typescript_definition::TypescriptDefinition)
)]
#[derive(BitRead, BitWrite, Debug, Clone, Copy, Default, Serialize, Deserialize, Display)] #[derive(BitRead, BitWrite, Debug, Clone, Copy, Default, Serialize, Deserialize, Display)]
#[display("({x}, {y})")] #[display("({x}, {y})")]
pub struct VectorXY { pub struct VectorXY {