Compare commits
4 Commits
0e73f7b5b3
...
0.0.3
| Author | SHA1 | Date | |
|---|---|---|---|
| bfb8c076be | |||
| f4b32f650c | |||
| c168df8365 | |||
| ffacba2e96 |
209
Cargo.lock
generated
209
Cargo.lock
generated
@ -105,7 +105,7 @@ dependencies = [
|
|||||||
"miniz_oxide",
|
"miniz_oxide",
|
||||||
"object",
|
"object",
|
||||||
"rustc-demangle",
|
"rustc-demangle",
|
||||||
"windows-targets",
|
"windows-targets 0.52.6",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@ -193,6 +193,16 @@ version = "1.0.2"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0"
|
checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "colored"
|
||||||
|
version = "2.2.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "117725a109d387c937a1533ce01b450cbde6b88abceea8473c4d7a85853cda3c"
|
||||||
|
dependencies = [
|
||||||
|
"lazy_static",
|
||||||
|
"windows-sys 0.59.0",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "core-foundation"
|
name = "core-foundation"
|
||||||
version = "0.9.4"
|
version = "0.9.4"
|
||||||
@ -210,13 +220,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
|||||||
checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
|
checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "ctor"
|
name = "deranged"
|
||||||
version = "0.2.8"
|
version = "0.4.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "edb49164822f3ee45b17acd4a208cfc1251410cf0cad9a833234c9890774dd9f"
|
checksum = "9c9e6a11ca8224451684bc0d7d5a7adbf8f2fd6887261a1cfc3c0432f9d4068e"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"quote",
|
"powerfmt",
|
||||||
"syn",
|
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@ -228,29 +237,6 @@ dependencies = [
|
|||||||
"cfg-if",
|
"cfg-if",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "env_filter"
|
|
||||||
version = "0.1.2"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "4f2c92ceda6ceec50f43169f9ee8424fe2db276791afde7b2cd8bc084cb376ab"
|
|
||||||
dependencies = [
|
|
||||||
"log",
|
|
||||||
"regex",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "env_logger"
|
|
||||||
version = "0.11.5"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "e13fa619b91fb2381732789fc5de83b45675e882f66623b7d8cb4f643017018d"
|
|
||||||
dependencies = [
|
|
||||||
"anstream",
|
|
||||||
"anstyle",
|
|
||||||
"env_filter",
|
|
||||||
"humantime",
|
|
||||||
"log",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "equivalent"
|
name = "equivalent"
|
||||||
version = "1.0.1"
|
version = "1.0.1"
|
||||||
@ -456,12 +442,6 @@ version = "1.9.4"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9"
|
checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9"
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "humantime"
|
|
||||||
version = "2.1.0"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "hyper"
|
name = "hyper"
|
||||||
version = "1.4.1"
|
version = "1.4.1"
|
||||||
@ -587,6 +567,7 @@ dependencies = [
|
|||||||
"clap",
|
"clap",
|
||||||
"libjrpc",
|
"libjrpc",
|
||||||
"log",
|
"log",
|
||||||
|
"simple_logger",
|
||||||
"walkdir",
|
"walkdir",
|
||||||
]
|
]
|
||||||
|
|
||||||
@ -629,8 +610,6 @@ name = "libjrpc"
|
|||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"ctor",
|
|
||||||
"env_logger",
|
|
||||||
"lazy_static",
|
"lazy_static",
|
||||||
"log",
|
"log",
|
||||||
"regex",
|
"regex",
|
||||||
@ -700,6 +679,21 @@ dependencies = [
|
|||||||
"tempfile",
|
"tempfile",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "num-conv"
|
||||||
|
version = "0.1.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "num_threads"
|
||||||
|
version = "0.1.7"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "5c7398b9c8b70908f6371f47ed36737907c87c52af34c268fed0bf0ceb92ead9"
|
||||||
|
dependencies = [
|
||||||
|
"libc",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "object"
|
name = "object"
|
||||||
version = "0.36.4"
|
version = "0.36.4"
|
||||||
@ -792,6 +786,12 @@ version = "1.9.0"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "cc9c68a3f6da06753e9335d63e27f6b9754dd1920d941135b7ea8224f141adb2"
|
checksum = "cc9c68a3f6da06753e9335d63e27f6b9754dd1920d941135b7ea8224f141adb2"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "powerfmt"
|
||||||
|
version = "0.2.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "proc-macro2"
|
name = "proc-macro2"
|
||||||
version = "1.0.86"
|
version = "1.0.86"
|
||||||
@ -1060,6 +1060,18 @@ version = "1.3.0"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
|
checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "simple_logger"
|
||||||
|
version = "5.0.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "e8c5dfa5e08767553704aa0ffd9d9794d527103c736aba9854773851fd7497eb"
|
||||||
|
dependencies = [
|
||||||
|
"colored",
|
||||||
|
"log",
|
||||||
|
"time",
|
||||||
|
"windows-sys 0.48.0",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "slab"
|
name = "slab"
|
||||||
version = "0.4.9"
|
version = "0.4.9"
|
||||||
@ -1166,6 +1178,39 @@ dependencies = [
|
|||||||
"windows-sys 0.59.0",
|
"windows-sys 0.59.0",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "time"
|
||||||
|
version = "0.3.41"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "8a7619e19bc266e0f9c5e6686659d394bc57973859340060a69221e57dbc0c40"
|
||||||
|
dependencies = [
|
||||||
|
"deranged",
|
||||||
|
"itoa",
|
||||||
|
"libc",
|
||||||
|
"num-conv",
|
||||||
|
"num_threads",
|
||||||
|
"powerfmt",
|
||||||
|
"serde",
|
||||||
|
"time-core",
|
||||||
|
"time-macros",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "time-core"
|
||||||
|
version = "0.1.4"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "c9e9a38711f559d9e3ce1cdb06dd7c5b8ea546bc90052da6d06bb76da74bb07c"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "time-macros"
|
||||||
|
version = "0.2.22"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "3526739392ec93fd8b359c8e98514cb3e8e021beb4e5f597b00a0221f8ed8a49"
|
||||||
|
dependencies = [
|
||||||
|
"num-conv",
|
||||||
|
"time-core",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "tinyvec"
|
name = "tinyvec"
|
||||||
version = "1.8.0"
|
version = "1.8.0"
|
||||||
@ -1478,7 +1523,7 @@ checksum = "e400001bb720a623c1c69032f8e3e4cf09984deec740f007dd2b03ec864804b0"
|
|||||||
dependencies = [
|
dependencies = [
|
||||||
"windows-result",
|
"windows-result",
|
||||||
"windows-strings",
|
"windows-strings",
|
||||||
"windows-targets",
|
"windows-targets 0.52.6",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@ -1487,7 +1532,7 @@ version = "0.2.0"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e"
|
checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"windows-targets",
|
"windows-targets 0.52.6",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@ -1497,7 +1542,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
|||||||
checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10"
|
checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"windows-result",
|
"windows-result",
|
||||||
"windows-targets",
|
"windows-targets 0.52.6",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "windows-sys"
|
||||||
|
version = "0.48.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
|
||||||
|
dependencies = [
|
||||||
|
"windows-targets 0.48.5",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@ -1506,7 +1560,7 @@ version = "0.52.0"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
|
checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"windows-targets",
|
"windows-targets 0.52.6",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@ -1515,7 +1569,22 @@ version = "0.59.0"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
|
checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"windows-targets",
|
"windows-targets 0.52.6",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "windows-targets"
|
||||||
|
version = "0.48.5"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c"
|
||||||
|
dependencies = [
|
||||||
|
"windows_aarch64_gnullvm 0.48.5",
|
||||||
|
"windows_aarch64_msvc 0.48.5",
|
||||||
|
"windows_i686_gnu 0.48.5",
|
||||||
|
"windows_i686_msvc 0.48.5",
|
||||||
|
"windows_x86_64_gnu 0.48.5",
|
||||||
|
"windows_x86_64_gnullvm 0.48.5",
|
||||||
|
"windows_x86_64_msvc 0.48.5",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@ -1524,28 +1593,46 @@ version = "0.52.6"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
|
checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"windows_aarch64_gnullvm",
|
"windows_aarch64_gnullvm 0.52.6",
|
||||||
"windows_aarch64_msvc",
|
"windows_aarch64_msvc 0.52.6",
|
||||||
"windows_i686_gnu",
|
"windows_i686_gnu 0.52.6",
|
||||||
"windows_i686_gnullvm",
|
"windows_i686_gnullvm",
|
||||||
"windows_i686_msvc",
|
"windows_i686_msvc 0.52.6",
|
||||||
"windows_x86_64_gnu",
|
"windows_x86_64_gnu 0.52.6",
|
||||||
"windows_x86_64_gnullvm",
|
"windows_x86_64_gnullvm 0.52.6",
|
||||||
"windows_x86_64_msvc",
|
"windows_x86_64_msvc 0.52.6",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "windows_aarch64_gnullvm"
|
||||||
|
version = "0.48.5"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "windows_aarch64_gnullvm"
|
name = "windows_aarch64_gnullvm"
|
||||||
version = "0.52.6"
|
version = "0.52.6"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
|
checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "windows_aarch64_msvc"
|
||||||
|
version = "0.48.5"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "windows_aarch64_msvc"
|
name = "windows_aarch64_msvc"
|
||||||
version = "0.52.6"
|
version = "0.52.6"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
|
checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "windows_i686_gnu"
|
||||||
|
version = "0.48.5"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "windows_i686_gnu"
|
name = "windows_i686_gnu"
|
||||||
version = "0.52.6"
|
version = "0.52.6"
|
||||||
@ -1558,24 +1645,48 @@ version = "0.52.6"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
|
checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "windows_i686_msvc"
|
||||||
|
version = "0.48.5"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "windows_i686_msvc"
|
name = "windows_i686_msvc"
|
||||||
version = "0.52.6"
|
version = "0.52.6"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
|
checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "windows_x86_64_gnu"
|
||||||
|
version = "0.48.5"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "windows_x86_64_gnu"
|
name = "windows_x86_64_gnu"
|
||||||
version = "0.52.6"
|
version = "0.52.6"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
|
checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "windows_x86_64_gnullvm"
|
||||||
|
version = "0.48.5"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "windows_x86_64_gnullvm"
|
name = "windows_x86_64_gnullvm"
|
||||||
version = "0.52.6"
|
version = "0.52.6"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
|
checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "windows_x86_64_msvc"
|
||||||
|
version = "0.48.5"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "windows_x86_64_msvc"
|
name = "windows_x86_64_msvc"
|
||||||
version = "0.52.6"
|
version = "0.52.6"
|
||||||
|
|||||||
@ -12,5 +12,6 @@ anyhow = "1"
|
|||||||
clap = { version = "4", features = ["derive"] }
|
clap = { version = "4", features = ["derive"] }
|
||||||
libjrpc = { path = "libjrpc" }
|
libjrpc = { path = "libjrpc" }
|
||||||
log = "0.4"
|
log = "0.4"
|
||||||
|
simple_logger = { version = "5.0.0", features = ["threads"] }
|
||||||
[dev-dependencies]
|
[dev-dependencies]
|
||||||
walkdir = "2"
|
walkdir = "2"
|
||||||
|
|||||||
@ -14,7 +14,3 @@ log = "0.4.22"
|
|||||||
regex = "1.10.6"
|
regex = "1.10.6"
|
||||||
reqwest = { version = "0.12.7", optional = true, features = ["blocking"] }
|
reqwest = { version = "0.12.7", optional = true, features = ["blocking"] }
|
||||||
url = { version = "2.5.2", optional = true }
|
url = { version = "2.5.2", optional = true }
|
||||||
|
|
||||||
[dev-dependencies]
|
|
||||||
env_logger = "0.11.5"
|
|
||||||
ctor = "*"
|
|
||||||
|
|||||||
@ -137,9 +137,9 @@ impl FileGenerator {
|
|||||||
self.a(6, content);
|
self.a(6, content);
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn add_line(&mut self, line: &str) {
|
// pub fn add_line(&mut self, line: &str) {
|
||||||
self.content.push(line.to_string());
|
// self.content.push(line.to_string());
|
||||||
}
|
// }
|
||||||
|
|
||||||
pub fn get_content(&self) -> String {
|
pub fn get_content(&self) -> String {
|
||||||
self.content.join("\n")
|
self.content.join("\n")
|
||||||
|
|||||||
@ -1,7 +1,7 @@
|
|||||||
use std::{
|
use std::{
|
||||||
collections::{HashMap, HashSet},
|
collections::{HashMap, HashSet},
|
||||||
error::Error,
|
error::Error,
|
||||||
fmt::Display,
|
fmt::{Debug, Display},
|
||||||
hash::{Hash, Hasher},
|
hash::{Hash, Hasher},
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -13,8 +13,9 @@ use crate::parser::{
|
|||||||
|
|
||||||
static BUILT_INS: [&str; 6] = ["int", "float", "string", "boolean", "bytes", "void"];
|
static BUILT_INS: [&str; 6] = ["int", "float", "string", "boolean", "bytes", "void"];
|
||||||
|
|
||||||
pub trait Definition {
|
pub trait Definition: Debug {
|
||||||
fn get_position(&self) -> ParserPosition;
|
fn get_position(&self) -> ParserPosition;
|
||||||
|
fn get_name(&self) -> String;
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Debug, Clone)]
|
#[derive(Debug, Clone)]
|
||||||
@ -186,6 +187,9 @@ impl Definition for TypeDefinition {
|
|||||||
fn get_position(&self) -> ParserPosition {
|
fn get_position(&self) -> ParserPosition {
|
||||||
self.position.clone()
|
self.position.clone()
|
||||||
}
|
}
|
||||||
|
fn get_name(&self) -> String {
|
||||||
|
self.name.clone()
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Debug, Clone)]
|
#[derive(Debug, Clone)]
|
||||||
@ -205,6 +209,9 @@ impl Definition for EnumDefinition {
|
|||||||
fn get_position(&self) -> ParserPosition {
|
fn get_position(&self) -> ParserPosition {
|
||||||
self.position.clone()
|
self.position.clone()
|
||||||
}
|
}
|
||||||
|
fn get_name(&self) -> String {
|
||||||
|
self.name.clone()
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Debug, Clone)]
|
#[derive(Debug, Clone)]
|
||||||
@ -225,6 +232,9 @@ impl Definition for ServiceDefinition {
|
|||||||
fn get_position(&self) -> ParserPosition {
|
fn get_position(&self) -> ParserPosition {
|
||||||
self.position.clone()
|
self.position.clone()
|
||||||
}
|
}
|
||||||
|
fn get_name(&self) -> String {
|
||||||
|
self.name.clone()
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Debug, Clone)]
|
#[derive(Debug, Clone)]
|
||||||
@ -263,7 +273,9 @@ fn build_type(stmt: &TypeStatement) -> Result<TypeDefinition> {
|
|||||||
|
|
||||||
for field in &stmt.fields {
|
for field in &stmt.fields {
|
||||||
let typ = BaseType::from(&field.fieldtype);
|
let typ = BaseType::from(&field.fieldtype);
|
||||||
|
if stmt.name != field.fieldtype {
|
||||||
typedef.depends.insert(typ.clone());
|
typedef.depends.insert(typ.clone());
|
||||||
|
}
|
||||||
|
|
||||||
if let Some(maptype) = &field.map {
|
if let Some(maptype) = &field.map {
|
||||||
if maptype != "string" && maptype != "int" {
|
if maptype != "string" && maptype != "int" {
|
||||||
|
|||||||
@ -10,31 +10,3 @@ pub use ir::IR;
|
|||||||
pub use parser::{Parser, RootNode};
|
pub use parser::{Parser, RootNode};
|
||||||
pub use process::FileProcessor;
|
pub use process::FileProcessor;
|
||||||
pub use tokenizer::{tokenize, Token, TokenError, TokenPosition, TokenType};
|
pub use tokenizer::{tokenize, Token, TokenError, TokenPosition, TokenType};
|
||||||
|
|
||||||
#[cfg(test)]
|
|
||||||
mod test {
|
|
||||||
use crate::targets::{self, rust::RustCompiler};
|
|
||||||
|
|
||||||
#[cfg(test)]
|
|
||||||
#[ctor::ctor]
|
|
||||||
fn init() {
|
|
||||||
env_logger::init();
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
pub fn parse_jrpc() {
|
|
||||||
let mut fp = crate::process::FileProcessor::new();
|
|
||||||
// let ir = fp.start_compile("./test.jrpc").unwrap();
|
|
||||||
let ir = fp.start_compile("http://127.0.0.1:7878/test.jrpc").unwrap();
|
|
||||||
|
|
||||||
println!("{:?}", ir);
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
pub fn generate_rust() {
|
|
||||||
let mut fp = crate::process::FileProcessor::new();
|
|
||||||
let ir = fp.start_compile("./test.jrpc").unwrap();
|
|
||||||
|
|
||||||
targets::compile::<RustCompiler>(ir, "./output/rust").unwrap();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|||||||
@ -667,8 +667,8 @@ pub struct ParserError {
|
|||||||
}
|
}
|
||||||
|
|
||||||
impl ParserError {
|
impl ParserError {
|
||||||
fn new(msg: &str, token: &Token) -> ParserError {
|
fn new(msg: &str, token: &Token) -> Self {
|
||||||
ParserError {
|
Self {
|
||||||
message: format!("{}: {}", msg, token.1),
|
message: format!("{}: {}", msg, token.1),
|
||||||
token: token.clone(),
|
token: token.clone(),
|
||||||
}
|
}
|
||||||
|
|||||||
@ -35,38 +35,44 @@ impl FileProcessor {
|
|||||||
false
|
false
|
||||||
}
|
}
|
||||||
|
|
||||||
fn resolve_path(input: &str, context: Option<&str>) -> String {
|
fn resolve_path(input: &str, context: Option<&str>) -> Result<String> {
|
||||||
trace!("FileProcessor::resolve_path({}, {:?})", input, context);
|
trace!("FileProcessor::resolve_path({}, {:?})", input, context);
|
||||||
let mut input = input.to_string();
|
let mut input = input.to_string();
|
||||||
#[cfg(feature = "http")]
|
#[cfg(feature = "http")]
|
||||||
if cfg!(feature = "http") && (Self::is_url(Some(&input)) || Self::is_url(context)) {
|
if cfg!(feature = "http") && (Self::is_url(Some(&input)) || Self::is_url(context)) {
|
||||||
if Self::is_url(Some(&input)) {
|
if Self::is_url(Some(&input)) {
|
||||||
input.to_string()
|
Ok(input.to_string())
|
||||||
} else {
|
} else {
|
||||||
let url = Url::parse(context.unwrap()).unwrap();
|
let url = Url::parse(context.unwrap()).unwrap();
|
||||||
if !input.ends_with(".jrpc") {
|
if !input.ends_with(".jrpc") {
|
||||||
input = format!("{}.jrpc", input);
|
input = format!("{}.jrpc", input);
|
||||||
}
|
}
|
||||||
url.join(&input).unwrap().to_string()
|
Ok(url.join(&input).unwrap().to_string())
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
if !input.ends_with(".jrpc") {
|
if !input.ends_with(".jrpc") {
|
||||||
input = format!("{}.jrpc", input);
|
input = format!("{}.jrpc", input);
|
||||||
}
|
}
|
||||||
if let Some(context) = context {
|
if let Some(context) = context {
|
||||||
let mut path = PathBuf::from(context);
|
let mut path = PathBuf::from(context).canonicalize()?;
|
||||||
path.pop();
|
path.pop();
|
||||||
path = path.join(input);
|
path = path.join(input).canonicalize()?;
|
||||||
path.to_str().unwrap().to_string()
|
Ok(path.to_str().unwrap().to_string())
|
||||||
} else {
|
} else {
|
||||||
input
|
// This will resolve the path!
|
||||||
|
let path = PathBuf::from(input).canonicalize()?;
|
||||||
|
Ok(path.to_str().unwrap().to_string())
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fn get_file_url(&mut self, url: &str) -> Result<String> {
|
fn get_file_url(&mut self, url: &str) -> Result<String> {
|
||||||
trace!("FileProcessor::get_file_url({})", url);
|
trace!("FileProcessor::get_file_url({})", url);
|
||||||
let resp = reqwest::blocking::get(url)?;
|
let resp = reqwest::blocking::ClientBuilder::new()
|
||||||
|
.danger_accept_invalid_certs(std::env::var("ACCPT_INVALID_CERTS").is_ok())
|
||||||
|
.build()?
|
||||||
|
.get(url)
|
||||||
|
.send()?;
|
||||||
let body = resp.text()?;
|
let body = resp.text()?;
|
||||||
self.file_cache.insert(url.to_string(), body.clone());
|
self.file_cache.insert(url.to_string(), body.clone());
|
||||||
Ok(body)
|
Ok(body)
|
||||||
@ -101,7 +107,7 @@ impl FileProcessor {
|
|||||||
}
|
}
|
||||||
|
|
||||||
fn process_file(&mut self, file: &str, root: bool) -> Result<Vec<RootNode>> {
|
fn process_file(&mut self, file: &str, root: bool) -> Result<Vec<RootNode>> {
|
||||||
let file = Self::resolve_path(file, None);
|
let file = Self::resolve_path(file, None)?;
|
||||||
trace!("FileProcessor::process_file({}, {})", file, root);
|
trace!("FileProcessor::process_file({}, {})", file, root);
|
||||||
if self.processed_files.contains(&file) {
|
if self.processed_files.contains(&file) {
|
||||||
return Ok(vec![]);
|
return Ok(vec![]);
|
||||||
@ -115,7 +121,7 @@ impl FileProcessor {
|
|||||||
let mut result = Vec::new();
|
let mut result = Vec::new();
|
||||||
for stmt in &parsed {
|
for stmt in &parsed {
|
||||||
if let crate::parser::RootNode::Import(stmt) = stmt {
|
if let crate::parser::RootNode::Import(stmt) = stmt {
|
||||||
let file = Self::resolve_path(&stmt.path, Some(&file));
|
let file = Self::resolve_path(&stmt.path, Some(&file))?;
|
||||||
let s = self.process_file(&file, false)?;
|
let s = self.process_file(&file, false)?;
|
||||||
result.extend(s);
|
result.extend(s);
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
@ -1,13 +1,47 @@
|
|||||||
|
use std::{
|
||||||
|
error::Error,
|
||||||
|
fmt::{Debug, Display},
|
||||||
|
};
|
||||||
|
|
||||||
use anyhow::Result;
|
use anyhow::Result;
|
||||||
|
|
||||||
use crate::{
|
use crate::{
|
||||||
compile::{Compile, CompileContext},
|
compile::{Compile, CompileContext},
|
||||||
|
ir::Definition,
|
||||||
IR,
|
IR,
|
||||||
};
|
};
|
||||||
|
|
||||||
pub mod rust;
|
pub mod rust;
|
||||||
pub mod typescript;
|
pub mod typescript;
|
||||||
|
|
||||||
|
#[derive(Debug, Clone)]
|
||||||
|
pub struct CompilerError<D: Definition> {
|
||||||
|
pub message: String,
|
||||||
|
pub definition: D,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl<D: Definition> CompilerError<D> {
|
||||||
|
fn new(msg: &str, definition: D) -> Self {
|
||||||
|
Self {
|
||||||
|
message: format!("{}: {}", msg, definition.get_name()),
|
||||||
|
definition,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl<D: Definition> Error for CompilerError<D> {}
|
||||||
|
|
||||||
|
impl<D: Definition> Display for CompilerError<D> {
|
||||||
|
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
|
||||||
|
write!(
|
||||||
|
f,
|
||||||
|
"CompilerError: {} at {:?}",
|
||||||
|
self.message,
|
||||||
|
self.definition.get_position()
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
pub fn compile<T: Compile>(ir: IR, output: &str) -> Result<()> {
|
pub fn compile<T: Compile>(ir: IR, output: &str) -> Result<()> {
|
||||||
let mut ctx = CompileContext::new(output);
|
let mut ctx = CompileContext::new(output);
|
||||||
let mut compiler = T::new(&ir.options)?;
|
let mut compiler = T::new(&ir.options)?;
|
||||||
@ -15,10 +49,29 @@ pub fn compile<T: Compile>(ir: IR, output: &str) -> Result<()> {
|
|||||||
|
|
||||||
for step in ir.steps.iter() {
|
for step in ir.steps.iter() {
|
||||||
match step {
|
match step {
|
||||||
crate::ir::Step::Type(definition) => compiler.generate_type(&mut ctx, &definition)?,
|
crate::ir::Step::Type(definition) => {
|
||||||
crate::ir::Step::Enum(definition) => compiler.generate_enum(&mut ctx, &definition)?,
|
match compiler.generate_type(&mut ctx, &definition) {
|
||||||
|
Ok(_) => (),
|
||||||
|
Err(err) => {
|
||||||
|
return Err(CompilerError::new(&err.to_string(), definition.clone()).into())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
crate::ir::Step::Enum(definition) => {
|
||||||
|
match compiler.generate_enum(&mut ctx, &definition) {
|
||||||
|
Ok(_) => (),
|
||||||
|
Err(err) => {
|
||||||
|
return Err(CompilerError::new(&err.to_string(), definition.clone()).into())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
crate::ir::Step::Service(definition) => {
|
crate::ir::Step::Service(definition) => {
|
||||||
compiler.generate_service(&mut ctx, &definition)?
|
match compiler.generate_service(&mut ctx, &definition) {
|
||||||
|
Ok(_) => (),
|
||||||
|
Err(err) => {
|
||||||
|
return Err(CompilerError::new(&err.to_string(), definition.clone()).into())
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -3,9 +3,7 @@ use log::warn;
|
|||||||
use std::collections::{HashMap, HashSet};
|
use std::collections::{HashMap, HashSet};
|
||||||
|
|
||||||
use crate::compile::{Compile, CompileContext, FileGenerator};
|
use crate::compile::{Compile, CompileContext, FileGenerator};
|
||||||
use crate::ir::{
|
use crate::ir::{BaseType, EnumDefinition, ServiceDefinition, Step, Type, TypeDefinition};
|
||||||
BaseType, EnumDefinition, ServiceDefinition, Step, Type, TypeDefinition, TypeModifier,
|
|
||||||
};
|
|
||||||
use crate::shared::Keywords;
|
use crate::shared::Keywords;
|
||||||
use crate::IR;
|
use crate::IR;
|
||||||
|
|
||||||
@ -148,8 +146,9 @@ impl RustCompiler {
|
|||||||
|
|
||||||
f.a0("#[async_trait]");
|
f.a0("#[async_trait]");
|
||||||
f.a0(format!("pub trait {} {{", definition.name));
|
f.a0(format!("pub trait {} {{", definition.name));
|
||||||
|
f.a1("type Context: Clone + Sync + Send + 'static;");
|
||||||
for method in definition.methods.iter() {
|
for method in definition.methods.iter() {
|
||||||
let params = method
|
let mut params = method
|
||||||
.inputs
|
.inputs
|
||||||
.iter()
|
.iter()
|
||||||
.map(|arg| {
|
.map(|arg| {
|
||||||
@ -159,8 +158,9 @@ impl RustCompiler {
|
|||||||
Self::type_to_rust_ext(&arg.typ)
|
Self::type_to_rust_ext(&arg.typ)
|
||||||
)
|
)
|
||||||
})
|
})
|
||||||
.collect::<Vec<String>>()
|
.collect::<Vec<String>>();
|
||||||
.join(", ");
|
params.push("ctx: Self::Context".to_string());
|
||||||
|
let params = params.join(", ");
|
||||||
|
|
||||||
let ret = method
|
let ret = method
|
||||||
.output
|
.output
|
||||||
@ -181,17 +181,20 @@ impl RustCompiler {
|
|||||||
f.a0("}");
|
f.a0("}");
|
||||||
|
|
||||||
f.a0("");
|
f.a0("");
|
||||||
f.a0(format!("pub struct {}Handler {{", definition.name));
|
f.a0(format!("pub struct {}Handler<Context> {{", definition.name));
|
||||||
f.a1(format!(
|
f.a1(format!(
|
||||||
"implementation: Box<dyn {} + Sync + Send + 'static>,",
|
"implementation: Box<dyn {}<Context = Context> + Sync + Send + 'static>,",
|
||||||
definition.name
|
definition.name
|
||||||
));
|
));
|
||||||
f.a0("}");
|
f.a0("}");
|
||||||
f.a0("");
|
f.a0("");
|
||||||
|
|
||||||
f.a0(format!("impl {}Handler {{", definition.name));
|
f.a0(format!(
|
||||||
|
"impl<Context: Clone + Sync + Send + 'static> {}Handler<Context> {{",
|
||||||
|
definition.name
|
||||||
|
));
|
||||||
f.a1(format!(
|
f.a1(format!(
|
||||||
"pub fn new(implementation: Box<dyn {} + Sync + Send + 'static>) -> Arc<Self> {{",
|
"pub fn new(implementation: Box<dyn {}<Context = Context> + Sync + Send + 'static>) -> Arc<Self> {{",
|
||||||
definition.name,
|
definition.name,
|
||||||
));
|
));
|
||||||
f.a2("Arc::from(Self { implementation })");
|
f.a2("Arc::from(Self { implementation })");
|
||||||
@ -202,9 +205,10 @@ impl RustCompiler {
|
|||||||
|
|
||||||
f.a0("#[async_trait]");
|
f.a0("#[async_trait]");
|
||||||
f.a0(format!(
|
f.a0(format!(
|
||||||
"impl JRPCServerService for {}Handler {{",
|
"impl<Context: Clone + Sync + Send + 'static> JRPCServerService for {}Handler<Context> {{",
|
||||||
definition.name
|
definition.name
|
||||||
));
|
));
|
||||||
|
f.a1("type Context = Context;");
|
||||||
f.a1(format!(
|
f.a1(format!(
|
||||||
"fn get_id(&self) -> String {{ \"{}\".to_owned() }} ",
|
"fn get_id(&self) -> String {{ \"{}\".to_owned() }} ",
|
||||||
definition.name
|
definition.name
|
||||||
@ -214,7 +218,7 @@ impl RustCompiler {
|
|||||||
|
|
||||||
f.a1("#[allow(non_snake_case)]");
|
f.a1("#[allow(non_snake_case)]");
|
||||||
f.a1(
|
f.a1(
|
||||||
"async fn handle(&self, msg: &JRPCRequest, function: &str) -> Result<(bool, Value)> {",
|
"async fn handle(&self, msg: &JRPCRequest, function: &str, ctx: Self::Context) -> Result<(bool, Value)> {",
|
||||||
);
|
);
|
||||||
f.a2("match function {");
|
f.a2("match function {");
|
||||||
|
|
||||||
@ -227,7 +231,7 @@ impl RustCompiler {
|
|||||||
));
|
));
|
||||||
if method.inputs.len() < 1 {
|
if method.inputs.len() < 1 {
|
||||||
f.a5(format!(
|
f.a5(format!(
|
||||||
"let res = self.implementation.{}().await?;",
|
"let res = self.implementation.{}(ctx).await?;",
|
||||||
method.name
|
method.name
|
||||||
));
|
));
|
||||||
f.a5("Ok((true, serde_json::to_value(res)?))");
|
f.a5("Ok((true, serde_json::to_value(res)?))");
|
||||||
@ -251,7 +255,7 @@ impl RustCompiler {
|
|||||||
),
|
),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
f.a5(").await?;");
|
f.a5(",ctx).await?;");
|
||||||
|
|
||||||
if let Some(_output) = &method.output {
|
if let Some(_output) = &method.output {
|
||||||
f.a5("Ok((true, serde_json::to_value(res)?))");
|
f.a5("Ok((true, serde_json::to_value(res)?))");
|
||||||
@ -279,7 +283,7 @@ impl RustCompiler {
|
|||||||
),
|
),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
f.a5(").await?;");
|
f.a5(", ctx).await?;");
|
||||||
if let Some(_output) = &method.output {
|
if let Some(_output) = &method.output {
|
||||||
f.a5("Ok((true, serde_json::to_value(res)?))");
|
f.a5("Ok((true, serde_json::to_value(res)?))");
|
||||||
} else {
|
} else {
|
||||||
@ -474,7 +478,7 @@ impl Compile for RustCompiler {
|
|||||||
}
|
}
|
||||||
|
|
||||||
f.a1(format!(
|
f.a1(format!(
|
||||||
"pub {}: {}",
|
"pub {}: {},",
|
||||||
Self::fix_keyword_name(&field.name),
|
Self::fix_keyword_name(&field.name),
|
||||||
Self::type_to_rust_ext(&field.typ)
|
Self::type_to_rust_ext(&field.typ)
|
||||||
));
|
));
|
||||||
|
|||||||
@ -1,78 +1,105 @@
|
|||||||
use anyhow::Result;
|
use anyhow::{anyhow, Result};
|
||||||
use log::{info, warn};
|
use log::info;
|
||||||
use std::collections::{HashMap, HashSet};
|
use std::collections::{HashMap, HashSet};
|
||||||
|
|
||||||
use crate::compile::{Compile, CompileContext, FileGenerator};
|
use crate::compile::{Compile, CompileContext, FileGenerator};
|
||||||
use crate::ir::{BaseType, EnumDefinition, ServiceDefinition, Step, Type, TypeDefinition};
|
use crate::ir::{BaseType, EnumDefinition, ServiceDefinition, Step, Type, TypeDefinition};
|
||||||
use crate::shared::Keywords;
|
|
||||||
use crate::IR;
|
use crate::IR;
|
||||||
|
|
||||||
#[derive(Debug, PartialEq, Eq, PartialOrd, Ord)]
|
// #[derive(Debug, PartialEq, Eq, PartialOrd, Ord)]
|
||||||
pub enum Flavour {
|
// pub enum Flavour {
|
||||||
ESM,
|
// ESM,
|
||||||
Node,
|
// Node,
|
||||||
|
// }
|
||||||
|
|
||||||
|
pub trait Flavour {
|
||||||
|
fn ext() -> &'static str;
|
||||||
|
fn name() -> &'static str;
|
||||||
}
|
}
|
||||||
|
|
||||||
pub struct TypeScriptCompiler {
|
pub struct Node;
|
||||||
flavour: Flavour,
|
impl Flavour for Node {
|
||||||
|
fn ext() -> &'static str {
|
||||||
|
""
|
||||||
|
}
|
||||||
|
fn name() -> &'static str {
|
||||||
|
"ts-node"
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static TS_KEYWORDS: [&'static str; 52] = [
|
pub struct ESM;
|
||||||
"abstract",
|
impl Flavour for ESM {
|
||||||
"arguments",
|
fn ext() -> &'static str {
|
||||||
"await",
|
".js"
|
||||||
"boolean",
|
}
|
||||||
"break",
|
|
||||||
"byte",
|
|
||||||
"case",
|
|
||||||
"catch",
|
|
||||||
"class",
|
|
||||||
"const",
|
|
||||||
"continue",
|
|
||||||
"debugger",
|
|
||||||
"default",
|
|
||||||
"delete",
|
|
||||||
"do",
|
|
||||||
"else",
|
|
||||||
"enum",
|
|
||||||
"export",
|
|
||||||
"extends",
|
|
||||||
"false",
|
|
||||||
"final",
|
|
||||||
"finally",
|
|
||||||
"for",
|
|
||||||
"function",
|
|
||||||
"goto",
|
|
||||||
"if",
|
|
||||||
"implements",
|
|
||||||
"import",
|
|
||||||
"in",
|
|
||||||
"instanceof",
|
|
||||||
"interface",
|
|
||||||
"let",
|
|
||||||
"new",
|
|
||||||
"null",
|
|
||||||
"package",
|
|
||||||
"private",
|
|
||||||
"protected",
|
|
||||||
"public",
|
|
||||||
"return",
|
|
||||||
"super",
|
|
||||||
"switch",
|
|
||||||
"this",
|
|
||||||
"throw",
|
|
||||||
"true",
|
|
||||||
"try",
|
|
||||||
"typeof",
|
|
||||||
"var",
|
|
||||||
"void",
|
|
||||||
"while",
|
|
||||||
"with",
|
|
||||||
"yield",
|
|
||||||
"static",
|
|
||||||
];
|
|
||||||
|
|
||||||
impl TypeScriptCompiler {
|
fn name() -> &'static str {
|
||||||
|
"ts-esm"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub struct TypeScriptCompiler<F: Flavour> {
|
||||||
|
// flavour: Flavour,
|
||||||
|
flavour: std::marker::PhantomData<F>,
|
||||||
|
}
|
||||||
|
|
||||||
|
// static TS_KEYWORDS: [&'static str; 52] = [
|
||||||
|
// "abstract",
|
||||||
|
// "arguments",
|
||||||
|
// "await",
|
||||||
|
// "boolean",
|
||||||
|
// "break",
|
||||||
|
// "byte",
|
||||||
|
// "case",
|
||||||
|
// "catch",
|
||||||
|
// "class",
|
||||||
|
// "const",
|
||||||
|
// "continue",
|
||||||
|
// "debugger",
|
||||||
|
// "default",
|
||||||
|
// "delete",
|
||||||
|
// "do",
|
||||||
|
// "else",
|
||||||
|
// "enum",
|
||||||
|
// "export",
|
||||||
|
// "extends",
|
||||||
|
// "false",
|
||||||
|
// "final",
|
||||||
|
// "finally",
|
||||||
|
// "for",
|
||||||
|
// "function",
|
||||||
|
// "goto",
|
||||||
|
// "if",
|
||||||
|
// "implements",
|
||||||
|
// "import",
|
||||||
|
// "in",
|
||||||
|
// "instanceof",
|
||||||
|
// "interface",
|
||||||
|
// "let",
|
||||||
|
// "new",
|
||||||
|
// "null",
|
||||||
|
// "package",
|
||||||
|
// "private",
|
||||||
|
// "protected",
|
||||||
|
// "public",
|
||||||
|
// "return",
|
||||||
|
// "super",
|
||||||
|
// "switch",
|
||||||
|
// "this",
|
||||||
|
// "throw",
|
||||||
|
// "true",
|
||||||
|
// "try",
|
||||||
|
// "typeof",
|
||||||
|
// "var",
|
||||||
|
// "void",
|
||||||
|
// "while",
|
||||||
|
// "with",
|
||||||
|
// "yield",
|
||||||
|
// "static",
|
||||||
|
// ];
|
||||||
|
|
||||||
|
impl<F: Flavour> TypeScriptCompiler<F> {
|
||||||
fn type_to_typescript(typ: &BaseType) -> String {
|
fn type_to_typescript(typ: &BaseType) -> String {
|
||||||
match typ {
|
match typ {
|
||||||
BaseType::String => "string".to_string(),
|
BaseType::String => "string".to_string(),
|
||||||
@ -109,13 +136,9 @@ impl TypeScriptCompiler {
|
|||||||
file: &mut FileGenerator,
|
file: &mut FileGenerator,
|
||||||
depends: &HashSet<BaseType>,
|
depends: &HashSet<BaseType>,
|
||||||
) -> Result<()> {
|
) -> Result<()> {
|
||||||
let esm = if self.flavour == Flavour::ESM {
|
let esm = F::ext();
|
||||||
".js"
|
|
||||||
} else {
|
|
||||||
""
|
|
||||||
};
|
|
||||||
file.a0(format!(
|
file.a0(format!(
|
||||||
"import {{ VerificationError, apply_int, apply_float, apply_string, apply_boolean, apply_void }} from \"./ts_base{esm}\""));
|
"import {{ VerificationError, apply_int, apply_float, apply_string, apply_bool, apply_void, apply_array, apply_required, apply_optional, apply_map }} from \"./ts_base{esm}\""));
|
||||||
for dep in depends {
|
for dep in depends {
|
||||||
match dep {
|
match dep {
|
||||||
BaseType::Custom(name) => {
|
BaseType::Custom(name) => {
|
||||||
@ -132,17 +155,83 @@ impl TypeScriptCompiler {
|
|||||||
}
|
}
|
||||||
|
|
||||||
fn fix_keyword_name(name: &str) -> String {
|
fn fix_keyword_name(name: &str) -> String {
|
||||||
if TS_KEYWORDS.contains(&name) {
|
// if TS_KEYWORDS.contains(&name) {
|
||||||
format!("{}_", name)
|
// format!("{}_", name)
|
||||||
} else {
|
// } else {
|
||||||
|
// name.to_string()
|
||||||
|
// }
|
||||||
|
// TODO: Check if this is something that can be implemented. There is the issue of JSON generation...
|
||||||
name.to_string()
|
name.to_string()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn get_type_apply(typ: &Type, value: &str) -> String {
|
||||||
|
let apply_field_value = format!("apply_{}", typ.0.to_string());
|
||||||
|
match &typ.1 {
|
||||||
|
crate::ir::TypeModifier::None => format!("{}({})", apply_field_value, value),
|
||||||
|
crate::ir::TypeModifier::Optional => format!("apply_optional({}, {})", value, apply_field_value),
|
||||||
|
crate::ir::TypeModifier::Array => format!("apply_array({}, {})", value, apply_field_value),
|
||||||
|
crate::ir::TypeModifier::OptionalArray => format!("apply_optional({}, data => apply_array(data, {}))", value, apply_field_value),
|
||||||
|
crate::ir::TypeModifier::Map(map) => format!("apply_map({}, apply_{}, {})", value, map.to_string(), apply_field_value),
|
||||||
|
crate::ir::TypeModifier::OptionalMap(map) => format!("apply_optional({}, data => apply_map(data, apply_{}, {}))", value, map.to_string(), apply_field_value),
|
||||||
|
crate::ir::TypeModifier::MapArray(map) => format!("apply_map({}, apply_{}, data => apply_array(data, {}))", value, map.to_string(), apply_field_value),
|
||||||
|
crate::ir::TypeModifier::OptionalMapArray(map) => format!("apply_optional({}, data => apply_map(data, apply_{}, (data) => apply_array(data, {})))", value, map.to_string(), apply_field_value),
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fn generate_service_lib(ctx: &CompileContext, ir: &IR) -> Result<()> {
|
fn generate_service_lib(&mut self, ctx: &CompileContext, ir: &IR) -> Result<()> {
|
||||||
|
let esm = F::ext();
|
||||||
|
|
||||||
let mut f = FileGenerator::new();
|
let mut f = FileGenerator::new();
|
||||||
|
|
||||||
let mut fc = FileGenerator::new();
|
let mut fc = FileGenerator::new();
|
||||||
|
fc.a0(format!("export * from \"./ts_service_client{}\";", esm));
|
||||||
|
fc.a0("");
|
||||||
|
|
||||||
let mut fs = FileGenerator::new();
|
let mut fs = FileGenerator::new();
|
||||||
|
fs.a0(format!("export * from \"./ts_service_server{}\";", esm));
|
||||||
|
fs.a0("");
|
||||||
|
|
||||||
|
for step in &ir.steps {
|
||||||
|
match step {
|
||||||
|
Step::Enum(def) => {
|
||||||
|
f.a0(format!(
|
||||||
|
"import {}, {{ apply_{} }} from \"./{}{}\";",
|
||||||
|
def.name, def.name, def.name, esm
|
||||||
|
));
|
||||||
|
f.a0(format!("export {{ {}, apply_{} }};", def.name, def.name));
|
||||||
|
f.a0("");
|
||||||
|
}
|
||||||
|
Step::Type(def) => {
|
||||||
|
f.a0(format!(
|
||||||
|
"import {}, {{ apply_{} }} from \"./{}{}\";",
|
||||||
|
def.name, def.name, def.name, esm
|
||||||
|
));
|
||||||
|
f.a0(format!("export {{ {}, apply_{} }};", def.name, def.name));
|
||||||
|
f.a0("");
|
||||||
|
}
|
||||||
|
Step::Service(def) => {
|
||||||
|
fc.a0(format!(
|
||||||
|
"export {{ {} }} from \"./{}_client{}\"",
|
||||||
|
def.name, def.name, esm
|
||||||
|
));
|
||||||
|
fs.a0(format!(
|
||||||
|
"export {{ {} }} from \"./{}_server{}\"",
|
||||||
|
def.name, def.name, esm
|
||||||
|
));
|
||||||
|
}
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
f.a0(format!("export * as Client from \"./index_client{}\"", esm));
|
||||||
|
f.a0(format!("export * as Server from \"./index_server{}\"", esm));
|
||||||
|
f.a0(format!(
|
||||||
|
"export {{ Logging }} from \"./ts_service_base{}\"",
|
||||||
|
esm
|
||||||
|
));
|
||||||
|
|
||||||
|
ctx.write_file("index.ts", &f.into_content())?;
|
||||||
|
ctx.write_file("index_client.ts", &fc.into_content())?;
|
||||||
|
ctx.write_file("index_server.ts", &fs.into_content())?;
|
||||||
|
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
@ -152,11 +241,7 @@ impl TypeScriptCompiler {
|
|||||||
ctx: &mut CompileContext,
|
ctx: &mut CompileContext,
|
||||||
definition: &ServiceDefinition,
|
definition: &ServiceDefinition,
|
||||||
) -> anyhow::Result<()> {
|
) -> anyhow::Result<()> {
|
||||||
let esm = if self.flavour == Flavour::ESM {
|
let esm = F::ext();
|
||||||
".js"
|
|
||||||
} else {
|
|
||||||
""
|
|
||||||
};
|
|
||||||
|
|
||||||
ctx.write_file("ts_service_server.ts", &format!("
|
ctx.write_file("ts_service_server.ts", &format!("
|
||||||
import {{ type RequestObject, type ResponseObject, ErrorCodes, Logging }} from \"./ts_service_base{esm}\";
|
import {{ type RequestObject, type ResponseObject, ErrorCodes, Logging }} from \"./ts_service_base{esm}\";
|
||||||
@ -190,7 +275,13 @@ import {{ VerificationError }} from \"./ts_base{esm}\";
|
|||||||
let mut params = func
|
let mut params = func
|
||||||
.inputs
|
.inputs
|
||||||
.iter()
|
.iter()
|
||||||
.map(|p| format!("{}: {}", p.name, Self::type_to_typescript_ext(&p.typ)))
|
.map(|p| {
|
||||||
|
format!(
|
||||||
|
"{}: {}",
|
||||||
|
Self::fix_keyword_name(&p.name),
|
||||||
|
Self::type_to_typescript_ext(&p.typ)
|
||||||
|
)
|
||||||
|
})
|
||||||
.collect::<Vec<String>>();
|
.collect::<Vec<String>>();
|
||||||
params.push("ctx: T".to_string());
|
params.push("ctx: T".to_string());
|
||||||
let params = params.join(", ");
|
let params = params.join(", ");
|
||||||
@ -207,6 +298,13 @@ import {{ VerificationError }} from \"./ts_base{esm}\";
|
|||||||
func.name,
|
func.name,
|
||||||
Self::type_to_typescript_ext(&output.typ)
|
Self::type_to_typescript_ext(&output.typ)
|
||||||
));
|
));
|
||||||
|
} else {
|
||||||
|
f.a1(format!("public abstract {}({}): void;", func.name, params));
|
||||||
|
f.a1(format!(
|
||||||
|
"_{}(params: any[] | any, ctx: T): void {{",
|
||||||
|
func.name,
|
||||||
|
));
|
||||||
|
}
|
||||||
let params_str_arr = func
|
let params_str_arr = func
|
||||||
.inputs
|
.inputs
|
||||||
.iter()
|
.iter()
|
||||||
@ -214,54 +312,34 @@ import {{ VerificationError }} from \"./ts_base{esm}\";
|
|||||||
.collect::<Vec<String>>()
|
.collect::<Vec<String>>()
|
||||||
.join(", ");
|
.join(", ");
|
||||||
f.a2(format!(
|
f.a2(format!(
|
||||||
"let p = this._into_parameters([{}], params)",
|
"let p = this._into_parameters([{}], params);",
|
||||||
params_str_arr
|
params_str_arr
|
||||||
));
|
));
|
||||||
|
|
||||||
for (index, input) in func.inputs.iter().enumerate() {
|
for (index, input) in func.inputs.iter().enumerate() {
|
||||||
f.a2(format!(
|
f.a2(format!(
|
||||||
"if(p[{}] !== null && p[{}] !== undefined) {{",
|
"p[{}] = {};",
|
||||||
index, index
|
index,
|
||||||
|
Self::get_type_apply(&input.typ, &format!("p[{}]", index))
|
||||||
));
|
));
|
||||||
if input.typ.array {
|
|
||||||
f.a2(format!("for (const elm of p[{}]) {{", index));
|
|
||||||
f.a3(format!("apply_{}(elm);", input.name));
|
|
||||||
f.a2(format!("}}"));
|
|
||||||
} else if let Some(_map) = &input.typ.map {
|
|
||||||
// TODO: Implement map type handling
|
|
||||||
panic!("Map in arguments is not allowed!");
|
|
||||||
} else {
|
|
||||||
f.a3(format!(
|
|
||||||
"apply_{}(p[{}]);",
|
|
||||||
input.typ.base.to_string(),
|
|
||||||
index
|
|
||||||
));
|
|
||||||
}
|
|
||||||
f.a2("}");
|
|
||||||
if !input.typ.optional {
|
|
||||||
f.a2(format!(
|
|
||||||
"else throw new Error(`Missing required parameter ${}`);",
|
|
||||||
input.name
|
|
||||||
));
|
|
||||||
}
|
|
||||||
f.a0("");
|
|
||||||
}
|
}
|
||||||
|
|
||||||
f.a2("p.push(ctx);");
|
f.a2("p.push(ctx);");
|
||||||
|
|
||||||
let ret_apply = String::new();
|
let ret_value = if let Some(output) = &func.output {
|
||||||
if output.typ.
|
let ret_apply = Self::get_type_apply(&output.typ, "res");
|
||||||
|
format!(".then(res => {})", ret_apply)
|
||||||
|
} else {
|
||||||
|
String::new()
|
||||||
|
};
|
||||||
|
|
||||||
f.a2("//@ts-ignore This will cause a typescript error when strict checking, since p is not a tuple");
|
f.a2("//@ts-ignore This will cause a typescript error when strict checking, since p is not a tuple");
|
||||||
f.a2(format!(
|
f.a2(format!(
|
||||||
"return this.{}.call(this, ...p).then(res=>{});",
|
"return this.{}.call(this, ...p){};",
|
||||||
func.name, ret_apply
|
func.name, ret_value
|
||||||
));
|
));
|
||||||
|
|
||||||
f.a1("}");
|
f.a1("}");
|
||||||
} else {
|
|
||||||
f.a1(format!("public abstract {}({}): void;", func.name, params));
|
|
||||||
}
|
|
||||||
|
|
||||||
f.a0("");
|
f.a0("");
|
||||||
}
|
}
|
||||||
@ -279,11 +357,7 @@ import {{ VerificationError }} from \"./ts_base{esm}\";
|
|||||||
ctx: &mut CompileContext,
|
ctx: &mut CompileContext,
|
||||||
definition: &ServiceDefinition,
|
definition: &ServiceDefinition,
|
||||||
) -> anyhow::Result<()> {
|
) -> anyhow::Result<()> {
|
||||||
let esm = if self.flavour == Flavour::ESM {
|
let esm = F::ext();
|
||||||
".js"
|
|
||||||
} else {
|
|
||||||
""
|
|
||||||
};
|
|
||||||
|
|
||||||
ctx.write_file(
|
ctx.write_file(
|
||||||
"ts_service_base.ts",
|
"ts_service_base.ts",
|
||||||
@ -364,7 +438,7 @@ import {{ VerificationError }} from \"./ts_base{esm}\";
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
impl Compile for TypeScriptCompiler {
|
impl<F: Flavour> Compile for TypeScriptCompiler<F> {
|
||||||
fn new(options: &HashMap<String, String>) -> Result<Self> {
|
fn new(options: &HashMap<String, String>) -> Result<Self> {
|
||||||
let flavour = options
|
let flavour = options
|
||||||
.get("flavour")
|
.get("flavour")
|
||||||
@ -372,15 +446,12 @@ impl Compile for TypeScriptCompiler {
|
|||||||
.unwrap_or_else(|| "node".to_string());
|
.unwrap_or_else(|| "node".to_string());
|
||||||
info!("TypeScript target initialized with flavour: {}", flavour);
|
info!("TypeScript target initialized with flavour: {}", flavour);
|
||||||
Ok(TypeScriptCompiler {
|
Ok(TypeScriptCompiler {
|
||||||
flavour: Flavour::ESM,
|
flavour: std::marker::PhantomData,
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
fn name(&self) -> String {
|
fn name(&self) -> String {
|
||||||
match self.flavour {
|
F::name().to_string()
|
||||||
Flavour::ESM => "ts-esm".to_string(),
|
|
||||||
Flavour::Node => "ts-node".to_string(),
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
fn start(&mut self, ctx: &mut CompileContext) -> anyhow::Result<()> {
|
fn start(&mut self, ctx: &mut CompileContext) -> anyhow::Result<()> {
|
||||||
@ -405,9 +476,12 @@ impl Compile for TypeScriptCompiler {
|
|||||||
for field in definition.fields.iter() {
|
for field in definition.fields.iter() {
|
||||||
let typ = Self::type_to_typescript_ext(&field.typ);
|
let typ = Self::type_to_typescript_ext(&field.typ);
|
||||||
|
|
||||||
|
let opt = if field.typ.is_optional() { "?" } else { "" };
|
||||||
|
|
||||||
f.a1(format!(
|
f.a1(format!(
|
||||||
"public {}: {};",
|
"public {}{}: {};",
|
||||||
Self::fix_keyword_name(&field.name),
|
Self::fix_keyword_name(&field.name),
|
||||||
|
opt,
|
||||||
typ
|
typ
|
||||||
));
|
));
|
||||||
}
|
}
|
||||||
@ -418,8 +492,12 @@ impl Compile for TypeScriptCompiler {
|
|||||||
));
|
));
|
||||||
f.a2("if(init) {");
|
f.a2("if(init) {");
|
||||||
for field in definition.fields.iter() {
|
for field in definition.fields.iter() {
|
||||||
f.a3(format!("if(init.{})", field.name));
|
f.a3(format!("if(init.{})", Self::fix_keyword_name(&field.name)));
|
||||||
f.a4(format!("this.{} = init[\"{}\"]", field.name, field.name));
|
f.a4(format!(
|
||||||
|
"this.{} = init[\"{}\"]",
|
||||||
|
Self::fix_keyword_name(&field.name),
|
||||||
|
Self::fix_keyword_name(&field.name)
|
||||||
|
));
|
||||||
}
|
}
|
||||||
f.a2("}");
|
f.a2("}");
|
||||||
f.a1("}");
|
f.a1("}");
|
||||||
@ -443,68 +521,12 @@ impl Compile for TypeScriptCompiler {
|
|||||||
f.a1(format!("let res = new {}() as any;", definition.name));
|
f.a1(format!("let res = new {}() as any;", definition.name));
|
||||||
|
|
||||||
for field in definition.fields.iter() {
|
for field in definition.fields.iter() {
|
||||||
if field.typ.is_optional() {
|
let value_name = format!("data.{}", Self::fix_keyword_name(&field.name));
|
||||||
f.a1(format!(
|
f.a1(format!(
|
||||||
"if (data.{} !== null && data.{} !== undefined ) {{",
|
"res.{} = {};",
|
||||||
field.name, field.name
|
Self::fix_keyword_name(&field.name),
|
||||||
|
Self::get_type_apply(&field.typ, &value_name)
|
||||||
));
|
));
|
||||||
} else {
|
|
||||||
f.a1(format!(
|
|
||||||
"if (data.{} === null || data.{} === undefined ) throw new VerificationError(\"{}\", \"{}\", data.{});",
|
|
||||||
field.name, field.name,
|
|
||||||
definition.name,
|
|
||||||
field.name,
|
|
||||||
field.name
|
|
||||||
));
|
|
||||||
f.a1("else {");
|
|
||||||
}
|
|
||||||
|
|
||||||
if field.typ.is_map() {
|
|
||||||
f.a2(format!(
|
|
||||||
"if (typeof data.{} != \"object\") throw new VerificationError(\"map\", \"{}\", data.{}); ",
|
|
||||||
field.name,
|
|
||||||
definition.name,
|
|
||||||
field.name
|
|
||||||
));
|
|
||||||
f.a2(format!("res.{} = {{}}", field.name));
|
|
||||||
f.a2(format!(
|
|
||||||
"Object.entries(data.{}).forEach(([key, val]) => res.{}[key] = apply_{}(val));",
|
|
||||||
field.name,
|
|
||||||
field.name,
|
|
||||||
Self::type_to_typescript(&field.typ.base),
|
|
||||||
));
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
if field.typ.is_array() {
|
|
||||||
f.a2(format!(
|
|
||||||
"if (!Array.isArray(data.{})) throw new VerificationError(\"array\", \"{}\", data.{});",
|
|
||||||
field.name,
|
|
||||||
definition.name,
|
|
||||||
field.name
|
|
||||||
));
|
|
||||||
f.a2(format!(
|
|
||||||
"res.{} = data.{}.map(elm => apply_{}(elm));",
|
|
||||||
field.name,
|
|
||||||
field.name,
|
|
||||||
Self::type_to_typescript(&field.typ.base),
|
|
||||||
));
|
|
||||||
}
|
|
||||||
|
|
||||||
if field.typ.array {
|
|
||||||
|
|
||||||
} else if let Some(_map) = &field.typ.map {
|
|
||||||
|
|
||||||
|
|
||||||
} else {
|
|
||||||
f.a2(format!(
|
|
||||||
"res.{} = apply_{}(data.{})",
|
|
||||||
field.name,
|
|
||||||
Self::type_to_typescript(&field.typ.base),
|
|
||||||
field.name
|
|
||||||
));
|
|
||||||
}
|
|
||||||
f.a1("}");
|
|
||||||
}
|
}
|
||||||
f.a1("return res;");
|
f.a1("return res;");
|
||||||
|
|
||||||
@ -560,7 +582,7 @@ impl Compile for TypeScriptCompiler {
|
|||||||
}
|
}
|
||||||
|
|
||||||
fn finalize(&mut self, ctx: &mut CompileContext, ir: &IR) -> anyhow::Result<()> {
|
fn finalize(&mut self, ctx: &mut CompileContext, ir: &IR) -> anyhow::Result<()> {
|
||||||
Self::generate_service_lib(ctx, ir)?;
|
self.generate_service_lib(ctx, ir)?;
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -6,10 +6,10 @@ edition = "2021"
|
|||||||
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
|
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
int-enum = { version = "0.5.0", features = ["serde", "convert"] }
|
int-enum = { version = "0.5", features = ["serde", "convert"] }
|
||||||
serde = { version = "1.0.147", features = ["derive"] }
|
serde = { version = "1", features = ["derive"] }
|
||||||
serde_json = "1.0.88"
|
serde_json = "1"
|
||||||
nanoid = "0.4.0"
|
nanoid = "0.4"
|
||||||
tokio = { version = "1.22.0", features = ["full"] }
|
tokio = { version = "1", features = ["full"] }
|
||||||
log = "0.4.17"
|
log = "0.4"
|
||||||
async-trait = "0.1.59"
|
async-trait = "0.1"
|
||||||
|
|||||||
@ -105,21 +105,27 @@ impl JRPCClient {
|
|||||||
}
|
}
|
||||||
|
|
||||||
#[async_trait::async_trait]
|
#[async_trait::async_trait]
|
||||||
pub trait JRPCServerService: Send + Sync + 'static {
|
pub trait JRPCServerService: Send + Sync {
|
||||||
|
type Context;
|
||||||
fn get_id(&self) -> String;
|
fn get_id(&self) -> String;
|
||||||
async fn handle(&self, request: &JRPCRequest, function: &str) -> Result<(bool, Value)>;
|
async fn handle(
|
||||||
|
&self,
|
||||||
|
request: &JRPCRequest,
|
||||||
|
function: &str,
|
||||||
|
ctx: Self::Context,
|
||||||
|
) -> Result<(bool, Value)>;
|
||||||
}
|
}
|
||||||
|
|
||||||
pub type JRPCServiceHandle = Arc<dyn JRPCServerService>;
|
pub type JRPCServiceHandle<Context> = Arc<dyn JRPCServerService<Context = Context>>;
|
||||||
|
|
||||||
#[derive(Clone)]
|
#[derive(Clone)]
|
||||||
pub struct JRPCSession {
|
pub struct JRPCSession<Context> {
|
||||||
server: JRPCServer,
|
server: JRPCServer<Context>,
|
||||||
message_sender: Sender<JRPCResult>,
|
message_sender: Sender<JRPCResult>,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl JRPCSession {
|
impl<Context: Clone + Send + Sync + 'static> JRPCSession<Context> {
|
||||||
pub fn new(server: JRPCServer, sender: Sender<JRPCResult>) -> JRPCSession {
|
pub fn new(server: JRPCServer<Context>, sender: Sender<JRPCResult>) -> Self {
|
||||||
JRPCSession {
|
JRPCSession {
|
||||||
server,
|
server,
|
||||||
message_sender: sender,
|
message_sender: sender,
|
||||||
@ -148,7 +154,7 @@ impl JRPCSession {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn handle_request(&self, request: JRPCRequest) -> () {
|
pub fn handle_request(&self, request: JRPCRequest, ctx: Context) -> () {
|
||||||
let session = self.clone();
|
let session = self.clone();
|
||||||
tokio::task::spawn(async move {
|
tokio::task::spawn(async move {
|
||||||
info!("Received request: {}", request.method);
|
info!("Received request: {}", request.method);
|
||||||
@ -163,7 +169,7 @@ impl JRPCSession {
|
|||||||
|
|
||||||
let service = session.server.services.get(service);
|
let service = session.server.services.get(service);
|
||||||
if let Some(service) = service {
|
if let Some(service) = service {
|
||||||
let result = service.handle(&request, function).await;
|
let result = service.handle(&request, function, ctx).await;
|
||||||
match result {
|
match result {
|
||||||
Ok((is_send, result)) => {
|
Ok((is_send, result)) => {
|
||||||
if is_send && request.id.is_some() {
|
if is_send && request.id.is_some() {
|
||||||
@ -204,23 +210,23 @@ impl JRPCSession {
|
|||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Clone)]
|
#[derive(Clone)]
|
||||||
pub struct JRPCServer {
|
pub struct JRPCServer<Context> {
|
||||||
services: HashMap<String, JRPCServiceHandle>,
|
services: HashMap<String, JRPCServiceHandle<Context>>,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl JRPCServer {
|
impl<Context: Clone + Send + Sync + 'static> JRPCServer<Context> {
|
||||||
pub fn new() -> JRPCServer {
|
pub fn new() -> Self {
|
||||||
JRPCServer {
|
JRPCServer {
|
||||||
services: HashMap::new(),
|
services: HashMap::new(),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn add_service(&mut self, service: JRPCServiceHandle) -> () {
|
pub fn add_service(&mut self, service: JRPCServiceHandle<Context>) -> () {
|
||||||
let id = service.get_id();
|
let id = service.get_id();
|
||||||
self.services.insert(id, service);
|
self.services.insert(id, service);
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn get_session(&self, sender: Sender<JRPCResult>) -> JRPCSession {
|
pub fn get_session(&self, sender: Sender<JRPCResult>) -> JRPCSession<Context> {
|
||||||
JRPCSession::new(self.clone(), sender)
|
JRPCSession::new(self.clone(), sender)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -14,7 +14,7 @@ export class VerificationError extends Error {
|
|||||||
constructor(
|
constructor(
|
||||||
public readonly type?: string,
|
public readonly type?: string,
|
||||||
public readonly field?: string,
|
public readonly field?: string,
|
||||||
public readonly value?: any
|
public readonly value?: any,
|
||||||
) {
|
) {
|
||||||
super(form_verficiation_error_message(type, field));
|
super(form_verficiation_error_message(type, field));
|
||||||
}
|
}
|
||||||
@ -28,8 +28,7 @@ export function apply_int(data: any) {
|
|||||||
|
|
||||||
export function apply_float(data: any) {
|
export function apply_float(data: any) {
|
||||||
data = Number(data);
|
data = Number(data);
|
||||||
if (Number.isNaN(data))
|
if (Number.isNaN(data)) throw new VerificationError("float", undefined, data);
|
||||||
throw new VerificationError("float", undefined, data);
|
|
||||||
return data;
|
return data;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -37,8 +36,52 @@ export function apply_string(data: any) {
|
|||||||
return String(data);
|
return String(data);
|
||||||
}
|
}
|
||||||
|
|
||||||
export function apply_boolean(data: any) {
|
export function apply_bool(data: any) {
|
||||||
return Boolean(data);
|
return Boolean(data);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function apply_map(
|
||||||
|
data: any,
|
||||||
|
apply_key: (data: any) => any,
|
||||||
|
apply_value: (data: any) => any,
|
||||||
|
) {
|
||||||
|
if (typeof data !== "object")
|
||||||
|
throw new VerificationError("map", undefined, data);
|
||||||
|
|
||||||
|
let res = {};
|
||||||
|
for (const key in data) {
|
||||||
|
let key_ = apply_key(key);
|
||||||
|
let value_ = apply_value(data[key]);
|
||||||
|
res[key_] = value_;
|
||||||
|
}
|
||||||
|
return res;
|
||||||
|
}
|
||||||
|
|
||||||
|
export function apply_array(data: any, apply_value: (data: any) => any) {
|
||||||
|
if (!Array.isArray(data))
|
||||||
|
throw new VerificationError("array", undefined, data);
|
||||||
|
return data.map((item) => apply_value(item));
|
||||||
|
}
|
||||||
|
|
||||||
|
export function apply_required(
|
||||||
|
data: any,
|
||||||
|
apply_value: (data: any) => any,
|
||||||
|
): any {
|
||||||
|
if (typeof data === "undefined" || data === null) {
|
||||||
|
throw new VerificationError("required", undefined, data);
|
||||||
|
}
|
||||||
|
return apply_value(data);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function apply_optional(
|
||||||
|
data: any,
|
||||||
|
apply_value: (data: any) => any,
|
||||||
|
): any {
|
||||||
|
if (typeof data === "undefined" || data === null) {
|
||||||
|
return data;
|
||||||
|
} else {
|
||||||
|
return apply_value(data);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
export function apply_void(data: any) {}
|
export function apply_void(data: any) {}
|
||||||
|
|||||||
23
src/main.rs
23
src/main.rs
@ -1,7 +1,10 @@
|
|||||||
use anyhow::Result;
|
use anyhow::Result;
|
||||||
use clap::{Parser, Subcommand};
|
use clap::{Parser, Subcommand};
|
||||||
use libjrpc::{
|
use libjrpc::{
|
||||||
targets::{rust::RustCompiler, typescript::TypeScriptCompiler},
|
targets::{
|
||||||
|
rust::RustCompiler,
|
||||||
|
typescript::{Node, TypeScriptCompiler},
|
||||||
|
},
|
||||||
FileProcessor,
|
FileProcessor,
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -29,6 +32,9 @@ enum Commands {
|
|||||||
}
|
}
|
||||||
|
|
||||||
pub fn main() -> Result<()> {
|
pub fn main() -> Result<()> {
|
||||||
|
use simple_logger::SimpleLogger;
|
||||||
|
SimpleLogger::new().init()?;
|
||||||
|
|
||||||
let cli = Cli::parse();
|
let cli = Cli::parse();
|
||||||
|
|
||||||
if cli.verbose {
|
if cli.verbose {
|
||||||
@ -55,17 +61,28 @@ pub fn main() -> Result<()> {
|
|||||||
|
|
||||||
match output_target {
|
match output_target {
|
||||||
"rust" => libjrpc::targets::compile::<RustCompiler>(ir, output_dir)?,
|
"rust" => libjrpc::targets::compile::<RustCompiler>(ir, output_dir)?,
|
||||||
"ts-node" => libjrpc::targets::compile::<TypeScriptCompiler>(ir, output_dir)?,
|
"ts-node" => {
|
||||||
|
libjrpc::targets::compile::<TypeScriptCompiler<Node>>(ir, output_dir)?
|
||||||
|
}
|
||||||
|
"ts-esm" => {
|
||||||
|
libjrpc::targets::compile::<TypeScriptCompiler<Node>>(ir, output_dir)?
|
||||||
|
}
|
||||||
_ => {
|
_ => {
|
||||||
println!("Unsupported target: {}", output_target);
|
println!("Unsupported target: {}", output_target);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if let Some(_def) = definition {
|
||||||
|
panic!("Definition output is not yet implemented!");
|
||||||
|
}
|
||||||
|
|
||||||
//TODO: Implement definition output!
|
//TODO: Implement definition output!
|
||||||
}
|
}
|
||||||
Commands::Targets => {
|
Commands::Targets => {
|
||||||
panic!("Not yet implemented!")
|
println!("rust");
|
||||||
|
println!("ts-node");
|
||||||
|
println!("ts-esm");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user