diff --git a/.cargo/config.toml b/.cargo/config.toml index 610b7b2e..d29b0de3 100644 --- a/.cargo/config.toml +++ b/.cargo/config.toml @@ -1,4 +1,3 @@ [alias] ts = ["test", "--features", "testing"] # cargo ts tw = ["test", "--workspace", "--features", "testing"] # cargo tw -td = ["test", "--doc", "-p"] # cargo td diff --git a/CREDITS.md b/CREDITS.md index f61bf867..eaf97333 100644 --- a/CREDITS.md +++ b/CREDITS.md @@ -26,6 +26,13 @@ para mostrar un banner de presentación en el terminal con el nombre de la aplic * [starwars.flf](http://www.figlet.org/fontdb_example.cgi?font=starwars.flf) de *Ryan Youck* +# 🎨 CSS + +La extensión `pagetop-bootsier` es un tema que integra [Bootstrap 5.3.8](https://getbootstrap.com/) +para los estilos y componentes de la interfaz. Bootstrap está distribuido bajo licencia +[MIT](https://github.com/twbs/bootstrap/blob/main/LICENSE). + + # 👾 Icono "La Mascota" sonriente es una simpática creación de [Webalys](https://www.iconfinder.com/webalys). diff --git a/Cargo.lock b/Cargo.lock index 433ce60d..bf8d11ed 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2,12 +2,270 @@ # It is not intended for manual editing. version = 4 +[[package]] +name = "actix-codec" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f7b0a21988c1bf877cf4759ef5ddaac04c1c9fe808c9142ecb78ba97d97a28a" +dependencies = [ + "bitflags", + "bytes", + "futures-core", + "futures-sink", + "memchr", + "pin-project-lite", + "tokio", + "tokio-util", + "tracing", +] + +[[package]] +name = "actix-files" +version = "0.6.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df8c4f30e3272d7c345f88ae0aac3848507ef5ba871f9cc2a41c8085a0f0523b" +dependencies = [ + "actix-http", + "actix-service", + "actix-utils", + "actix-web", + "bitflags", + "bytes", + "derive_more 2.1.1", + "futures-core", + "http-range", + "log", + "mime", + "mime_guess", + "percent-encoding", + "pin-project-lite", + "v_htmlescape", +] + +[[package]] +name = "actix-http" +version = "3.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93acb4a42f64936f9b8cae4a433b237599dd6eb6ed06124eb67132ef8cc90662" +dependencies = [ + "actix-codec", + "actix-rt", + "actix-service", + "actix-utils", + "base64 0.22.1", + "bitflags", + "brotli", + "bytes", + "bytestring", + "derive_more 2.1.1", + "encoding_rs", + "flate2", + "foldhash", + "futures-core", + "h2", + "http", + "httparse", + "httpdate", + "itoa", + "language-tags", + "local-channel", + "mime", + "percent-encoding", + "pin-project-lite", + "rand 0.10.1", + "sha1", + "smallvec", + "tokio", + "tokio-util", + "tracing", + "zstd", +] + +[[package]] +name = "actix-macros" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e01ed3140b2f8d422c68afa1ed2e85d996ea619c988ac834d255db32138655cb" +dependencies = [ + "quote", + "syn", +] + +[[package]] +name = "actix-router" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14f8c75c51892f18d9c46150c5ac7beb81c95f78c8b83a634d49f4ca32551fe7" +dependencies = [ + "bytestring", + "cfg-if", + "http", + "regex", + "regex-lite", + "serde", + "tracing", +] + +[[package]] +name = "actix-rt" +version = "2.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92589714878ca59a7626ea19734f0e07a6a875197eec751bb5d3f99e64998c63" +dependencies = [ + "futures-core", + "tokio", +] + +[[package]] +name = "actix-server" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a65064ea4a457eaf07f2fba30b4c695bf43b721790e9530d26cb6f9019ff7502" +dependencies = [ + "actix-rt", + "actix-service", + "actix-utils", + "futures-core", + "futures-util", + "mio", + "socket2 0.5.10", + "tokio", + "tracing", +] + +[[package]] +name = "actix-service" +version = "2.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e46f36bf0e5af44bdc4bdb36fbbd421aa98c79a9bce724e1edeb3894e10dc7f" +dependencies = [ + "futures-core", + "pin-project-lite", +] + +[[package]] +name = "actix-session" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "400c27fd4cdbe0082b7bbd29ac44a3070cbda1b2114138dc106ba39fe2f90dff" +dependencies = [ + "actix-service", + "actix-utils", + "actix-web", + "anyhow", + "derive_more 2.1.1", + "rand 0.9.4", + "serde", + "serde_json", + "tracing", +] + +[[package]] +name = "actix-utils" +version = "3.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88a1dcdff1466e3c2488e1cb5c36a71822750ad43839937f85d2f4d9f8b705d8" +dependencies = [ + "local-waker", + "pin-project-lite", +] + +[[package]] +name = "actix-web" +version = "4.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff87453bc3b56e9b2b23c1cc0b1be8797184accf51d2abe0f8a33ec275d316bf" +dependencies = [ + "actix-codec", + "actix-http", + "actix-macros", + "actix-router", + "actix-rt", + "actix-server", + "actix-service", + "actix-utils", + "actix-web-codegen", + "bytes", + "bytestring", + "cfg-if", + "cookie", + "derive_more 2.1.1", + "encoding_rs", + "foldhash", + "futures-core", + "futures-util", + "impl-more", + "itoa", + "language-tags", + "log", + "mime", + "once_cell", + "pin-project-lite", + "regex", + "regex-lite", + "serde", + "serde_json", + "serde_urlencoded", + "smallvec", + "socket2 0.6.3", + "time", + "tracing", + "url", +] + +[[package]] +name = "actix-web-codegen" +version = "4.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f591380e2e68490b5dfaf1dd1aa0ebe78d84ba7067078512b4ea6e4492d622b8" +dependencies = [ + "actix-router", + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "adler2" version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa" +[[package]] +name = "aead" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d122413f284cf2d62fb1b7db97e02edb8cda96d769b16e443a4f6195e35662b0" +dependencies = [ + "crypto-common 0.1.7", + "generic-array", +] + +[[package]] +name = "aes" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0" +dependencies = [ + "cfg-if", + "cipher", + "cpufeatures 0.2.17", +] + +[[package]] +name = "aes-gcm" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "831010a0f742e1209b3bcea8fab6a8e149051ba6099432c8cb2cc117dec3ead1" +dependencies = [ + "aead", + "aes", + "cipher", + "ctr", + "ghash", + "subtle", +] + [[package]] name = "ahash" version = "0.8.12" @@ -30,10 +288,19 @@ dependencies = [ ] [[package]] -name = "aliasable" -version = "0.1.3" +name = "alloc-no-stdlib" +version = "2.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "250f629c0161ad8107cf89319e990051fae62832fd343083bea452d93e2205fd" +checksum = "cc7bb162ec39d46ab1ca8c77bf72e890535becd1751bb45f64c597edb4c8c6b3" + +[[package]] +name = "alloc-stdlib" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94fb8275041c72129eb51b7d0322c29b8387a0386127718b096429201a5d6ece" +dependencies = [ + "alloc-no-stdlib", +] [[package]] name = "allocator-api2" @@ -106,54 +373,6 @@ version = "1.0.102" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f202df86484c868dbad7eaa557ef785d5c66295e41b460ef922eca0723b842c" -[[package]] -name = "async-stream" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b5a71a6f37880a80d1d7f19efd781e4b5de42c88f0722cc13bcb6cc2cfe8476" -dependencies = [ - "async-stream-impl", - "futures-core", - "pin-project-lite", -] - -[[package]] -name = "async-stream-impl" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "async-trait" -version = "0.1.89" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9035ad2d096bed7955a320ee7e2230574d28fd3c3a0f186cbea1ff3c7eed5dbb" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "atoi" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f28d99ec8bfea296261ca1af174f24225171fea9664ba9003cbebee704810528" -dependencies = [ - "num-traits", -] - -[[package]] -name = "atomic-waker" -version = "1.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" - [[package]] name = "autocfg" version = "1.5.0" @@ -161,56 +380,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8" [[package]] -name = "axum" -version = "0.8.9" +name = "base64" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31b698c5f9a010f6573133b09e0de5408834d0c82f8d7475a89fc1867a71cd90" -dependencies = [ - "axum-core", - "bytes", - "form_urlencoded", - "futures-util", - "http", - "http-body", - "http-body-util", - "hyper", - "hyper-util", - "itoa", - "matchit", - "memchr", - "mime", - "percent-encoding", - "pin-project-lite", - "serde_core", - "serde_json", - "serde_path_to_error", - "serde_urlencoded", - "sync_wrapper", - "tokio", - "tower", - "tower-layer", - "tower-service", - "tracing", -] - -[[package]] -name = "axum-core" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08c78f31d7b1291f7ee735c1c6780ccde7785daae9a9206026862dab7d8792d1" -dependencies = [ - "bytes", - "futures-core", - "http", - "http-body", - "http-body-util", - "mime", - "pin-project-lite", - "sync_wrapper", - "tower-layer", - "tower-service", - "tracing", -] +checksum = "0ea22880d78093b0cbe17c89f64a7d457941e65759157ec6cb31a31d652b05e5" [[package]] name = "base64" @@ -218,20 +391,11 @@ version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" -[[package]] -name = "base64ct" -version = "1.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2af50177e190e07a26ab74f8b1efbfe2ef87da2116221318cb1c2e82baf7de06" - [[package]] name = "bitflags" version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c4512299f36f043ab09a583e57bceb5a5aab7a73db1805848e8fef3c9e8c78b3" -dependencies = [ - "serde_core", -] [[package]] name = "block-buffer" @@ -242,6 +406,36 @@ dependencies = [ "generic-array", ] +[[package]] +name = "block-buffer" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cdd35008169921d80bc60d3d0ab416eecb028c4cd653352907921d95084790be" +dependencies = [ + "hybrid-array", +] + +[[package]] +name = "brotli" +version = "8.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4bd8b9603c7aa97359dbd97ecf258968c95f3adddd6db2f7e7a5bef101c84560" +dependencies = [ + "alloc-no-stdlib", + "alloc-stdlib", + "brotli-decompressor", +] + +[[package]] +name = "brotli-decompressor" +version = "5.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "874bb8112abecc98cbd6d81ea4fa7e94fb9449648c93cc89aa40c81c24d7de03" +dependencies = [ + "alloc-no-stdlib", + "alloc-stdlib", +] + [[package]] name = "bstr" version = "1.12.1" @@ -271,12 +465,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e748733b7cbc798e1434b6ac524f0c1ff2ab456fe201501e6497c8417a4fc33" [[package]] -name = "cc" -version = "1.2.62" +name = "bytestring" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1dce859f0832a7d088c4f1119888ab94ef4b5d6795d1ce05afb7fe159d79f98" +checksum = "86566c496f2f47d9b8147a4c8b02ffdb69c919fe0c2b2e7195d22cbba0e635c9" +dependencies = [ + "bytes", +] + +[[package]] +name = "cc" +version = "1.2.61" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d16d90359e986641506914ba71350897565610e87ce0ad9e6f28569db3dd5c6d" dependencies = [ "find-msvc-tools", + "jobserver", + "libc", "shlex", ] @@ -286,6 +491,17 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801" +[[package]] +name = "chacha20" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f8d983286843e49675a4b7a2d174efe136dc93a18d69130dd18198a6c167601" +dependencies = [ + "cfg-if", + "cpufeatures 0.3.0", + "rand_core 0.10.1", +] + [[package]] name = "change-detection" version = "1.2.0" @@ -309,6 +525,16 @@ dependencies = [ "windows-link", ] +[[package]] +name = "cipher" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad" +dependencies = [ + "crypto-common 0.1.7", + "inout", +] + [[package]] name = "clap" version = "4.6.1" @@ -363,15 +589,6 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7439becb5fafc780b6f4de382b1a7a3e70234afe783854a4702ee8adbb838609" -[[package]] -name = "concurrent-queue" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973" -dependencies = [ - "crossbeam-utils", -] - [[package]] name = "config" version = "0.15.22" @@ -386,18 +603,41 @@ dependencies = [ [[package]] name = "const-oid" -version = "0.9.6" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" +checksum = "a6ef517f0926dd24a1582492c791b6a4818a4d94e789a334894aa15b0d12f55c" [[package]] -name = "core-foundation" -version = "0.10.1" +name = "convert_case" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2a6cd9ae233e7f62ba4e9353e81a88df7fc8a5987b8d445b4d90c879bd156f6" +checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" + +[[package]] +name = "convert_case" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "633458d4ef8c78b72454de2d54fd6ab2e60f9e02be22f3c6104cdc8a4e0fceb9" dependencies = [ - "core-foundation-sys", - "libc", + "unicode-segmentation", +] + +[[package]] +name = "cookie" +version = "0.16.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e859cd57d0710d9e06c381b550c06e76992472a8c6d527aecd2fc673dcc231fb" +dependencies = [ + "aes-gcm", + "base64 0.20.0", + "hkdf", + "hmac", + "percent-encoding", + "rand 0.8.6", + "sha2", + "subtle", + "time", + "version_check", ] [[package]] @@ -416,20 +656,14 @@ dependencies = [ ] [[package]] -name = "crc" -version = "3.4.0" +name = "cpufeatures" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5eb8a2a1cd12ab0d987a5d5e825195d372001a4094a0376319d5a0ad71c1ba0d" +checksum = "8b2a41393f66f16b0823bb79094d54ac5fbd34ab292ddafb9a0456ac9f87d201" dependencies = [ - "crc-catalog", + "libc", ] -[[package]] -name = "crc-catalog" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "217698eaf96b4a3f0bc4f3662aaa55bdf913cd54d7204591faa790070c6d0853" - [[package]] name = "crc32fast" version = "1.5.0" @@ -467,15 +701,6 @@ dependencies = [ "crossbeam-utils", ] -[[package]] -name = "crossbeam-queue" -version = "0.3.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f58bbc28f91df819d0aa2a2c00cd19754769c2fad90579b3592b1c9ba7a3115" -dependencies = [ - "crossbeam-utils", -] - [[package]] name = "crossbeam-utils" version = "0.8.21" @@ -489,52 +714,26 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "78c8292055d1c1df0cce5d180393dc8cce0abec0a7102adb6c7b1eef6016d60a" dependencies = [ "generic-array", + "rand_core 0.6.4", "typenum", ] [[package]] -name = "darling" -version = "0.20.11" +name = "crypto-common" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc7f46116c46ff9ab3eb1597a45688b6715c6e628b5c133e288e709a29bcb4ee" +checksum = "77727bb15fa921304124b128af125e7e3b968275d1b108b379190264f4423710" dependencies = [ - "darling_core", - "darling_macro", + "hybrid-array", ] [[package]] -name = "darling_core" -version = "0.20.11" +name = "ctr" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d00b9596d185e565c2207a0b01f8bd1a135483d02d9b7b0a54b11da8d53412e" +checksum = "0369ee1ad671834580515889b80f2ea915f23b8be8d0daa4bbaf2ac5c7590835" dependencies = [ - "fnv", - "ident_case", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "darling_macro" -version = "0.20.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc34b93ccb385b40dc71c6fceac4b2ad23662c7eeb248cf10d529b7e055b6ead" -dependencies = [ - "darling_core", - "quote", - "syn", -] - -[[package]] -name = "der" -version = "0.7.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7c1832837b905bbfb5101e07cc24c8deddf52f93225eee6ead5f4d63d53ddcb" -dependencies = [ - "const-oid", - "pem-rfc7468", - "zeroize", + "cipher", ] [[package]] @@ -546,6 +745,19 @@ dependencies = [ "powerfmt", ] +[[package]] +name = "derive_more" +version = "0.99.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6edb4b64a43d977b8e99788fe3a04d483834fba1215a7e02caa415b626497f7f" +dependencies = [ + "convert_case 0.4.0", + "proc-macro2", + "quote", + "rustc_version", + "syn", +] + [[package]] name = "derive_more" version = "2.1.1" @@ -561,6 +773,7 @@ version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "799a97264921d8623a957f6c3b9011f3b5492f557bbb7a5a19b7fa6d06ba8dcb" dependencies = [ + "convert_case 0.10.0", "proc-macro2", "quote", "rustc_version", @@ -574,12 +787,22 @@ version = "0.10.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" dependencies = [ - "block-buffer", - "const-oid", - "crypto-common", + "block-buffer 0.10.4", + "crypto-common 0.1.7", "subtle", ] +[[package]] +name = "digest" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4850db49bf08e663084f7fb5c87d202ef91a3907271aff24a94eb97ff039153c" +dependencies = [ + "block-buffer 0.12.0", + "const-oid", + "crypto-common 0.2.1", +] + [[package]] name = "displaydoc" version = "0.2.5" @@ -592,18 +815,12 @@ dependencies = [ ] [[package]] -name = "dotenvy" -version = "0.15.7" +name = "encoding_rs" +version = "0.8.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1aaf95b3e5c8f23aa320147307562d361db0ae0d51242340f558153b4eb2439b" - -[[package]] -name = "either" -version = "1.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719" +checksum = "75030f3c4f45dafd7586dd6780965a8c7e8e285a5ecb86713e63a79c5b2766f3" dependencies = [ - "serde", + "cfg-if", ] [[package]] @@ -622,28 +839,6 @@ dependencies = [ "windows-sys 0.61.2", ] -[[package]] -name = "etcetera" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "136d1b5283a1ab77bd9257427ffd09d8667ced0570b6f938942bc7568ed5b943" -dependencies = [ - "cfg-if", - "home", - "windows-sys 0.48.0", -] - -[[package]] -name = "event-listener" -version = "5.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e13b66accf52311f30a0db42147dadea9850cb48cd070028831ae5f5d4b856ab" -dependencies = [ - "concurrent-queue", - "parking", - "pin-project-lite", -] - [[package]] name = "fastrand" version = "2.4.1" @@ -748,8 +943,6 @@ version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "da0e4dd2a88388a1f4ccc7c9ce104604dab68d9f408dc34cd45823d5a9069095" dependencies = [ - "futures-core", - "futures-sink", "spin", ] @@ -765,21 +958,6 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2" -[[package]] -name = "foreign-types" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" -dependencies = [ - "foreign-types-shared", -] - -[[package]] -name = "foreign-types-shared" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" - [[package]] name = "form_urlencoded" version = "1.2.2" @@ -789,64 +967,12 @@ dependencies = [ "percent-encoding", ] -[[package]] -name = "futures" -version = "0.3.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b147ee9d1f6d097cef9ce628cd2ee62288d963e16fb287bd9286455b241382d" -dependencies = [ - "futures-channel", - "futures-core", - "futures-io", - "futures-sink", - "futures-task", - "futures-util", -] - -[[package]] -name = "futures-channel" -version = "0.3.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07bbe89c50d7a535e539b8c17bc0b49bdb77747034daa8087407d655f3f7cc1d" -dependencies = [ - "futures-core", - "futures-sink", -] - [[package]] name = "futures-core" version = "0.3.32" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7e3450815272ef58cec6d564423f6e755e25379b217b0bc688e295ba24df6b1d" -[[package]] -name = "futures-executor" -version = "0.3.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf29c38818342a3b26b5b923639e7b1f4a61fc5e76102d4b1981c6dc7a7579d" -dependencies = [ - "futures-core", - "futures-task", - "futures-util", -] - -[[package]] -name = "futures-intrusive" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d930c203dd0b6ff06e0201a4a2fe9149b43c684fd4420555b26d21b1a02956f" -dependencies = [ - "futures-core", - "lock_api", - "parking_lot", -] - -[[package]] -name = "futures-io" -version = "0.3.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cecba35d7ad927e23624b22ad55235f2239cfa44fd10428eecbeba6d6a717718" - [[package]] name = "futures-sink" version = "0.3.32" @@ -866,10 +992,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "389ca41296e6190b48053de0321d02a77f32f8a5d2461dd38762c0593805c6d6" dependencies = [ "futures-core", - "futures-io", - "futures-sink", "futures-task", - "memchr", "pin-project-lite", "slab", ] @@ -897,6 +1020,18 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "getrandom" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "899def5c37c4fd7b2664648c28120ecec138e4d395b459e5ca34f9cce2dd77fd" +dependencies = [ + "cfg-if", + "libc", + "r-efi 5.3.0", + "wasip2", +] + [[package]] name = "getrandom" version = "0.4.2" @@ -905,7 +1040,8 @@ checksum = "0de51e6874e94e7bf76d726fc5d13ba782deca734ff60d5bb2fb2607c7406555" dependencies = [ "cfg-if", "libc", - "r-efi", + "r-efi 6.0.0", + "rand_core 0.10.1", "wasip2", "wasip3", ] @@ -921,6 +1057,16 @@ dependencies = [ "syn", ] +[[package]] +name = "ghash" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0d8a4362ccb29cb0b265253fb0a2728f592895ee6854fd9bc13f2ffda266ff1" +dependencies = [ + "opaque-debug", + "polyval", +] + [[package]] name = "glob" version = "0.3.3" @@ -962,7 +1108,26 @@ dependencies = [ "lasso", "once_cell", "phf", - "rand", + "rand 0.8.6", +] + +[[package]] +name = "h2" +version = "0.3.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0beca50380b1fc32983fc1cb4587bfa4bb9e78fc259aad4a0032d2080309222d" +dependencies = [ + "bytes", + "fnv", + "futures-core", + "futures-sink", + "futures-util", + "http", + "indexmap", + "slab", + "tokio", + "tokio-util", + "tracing", ] [[package]] @@ -981,31 +1146,14 @@ version = "0.15.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9229cfe53dfd69f0609a49f65461bd93001ea1ef889cd5529dd176593f5338a1" dependencies = [ - "allocator-api2", - "equivalent", "foldhash", ] [[package]] name = "hashbrown" -version = "0.17.1" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed5909b6e89a2db4456e54cd5f673791d7eca6732202bbf2a9cc504fe2f9b84a" - -[[package]] -name = "hashlink" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7382cf6263419f2d8df38c55d7da83da5c18aef87fc7a7fc1fb1e344edfe14c1" -dependencies = [ - "hashbrown 0.15.5", -] - -[[package]] -name = "heck" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" +checksum = "4f467dd6dccf739c208452f8014c75c18bb8301b050ad1cfb27153803edb0f51" [[package]] name = "heck" @@ -1013,12 +1161,6 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" -[[package]] -name = "hex" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" - [[package]] name = "hkdf" version = "0.12.4" @@ -1034,56 +1176,25 @@ version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" dependencies = [ - "digest", -] - -[[package]] -name = "home" -version = "0.5.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc627f471c528ff0c4a49e1d5e60450c8f6461dd6d10ba9dcd3a61d3dff7728d" -dependencies = [ - "windows-sys 0.61.2", + "digest 0.10.7", ] [[package]] name = "http" -version = "1.4.1" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8be7462df143984c4598a256ef469b251d7d7f9e271135073e78fc535414f3d0" +checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" dependencies = [ "bytes", + "fnv", "itoa", ] [[package]] -name = "http-body" -version = "1.0.1" +name = "http-range" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" -dependencies = [ - "bytes", - "http", -] - -[[package]] -name = "http-body-util" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b021d93e26becf5dc7e1b75b1bed1fd93124b374ceb73f43d4d4eafec896a64a" -dependencies = [ - "bytes", - "futures-core", - "http", - "http-body", - "pin-project-lite", -] - -[[package]] -name = "http-range-header" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9171a2ea8a68358193d15dd5d70c1c10a2afc3e7e4c5bc92bc9f025cebd7359c" +checksum = "21dec9db110f5f872ed9699c3ecf50cf16f423502706ba5c72462e28d3157573" [[package]] name = "httparse" @@ -1098,38 +1209,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" [[package]] -name = "hyper" -version = "1.9.0" +name = "hybrid-array" +version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6299f016b246a94207e63da54dbe807655bf9e00044f73ded42c3ac5305fbcca" +checksum = "08d46837a0ed51fe95bd3b05de33cd64a1ee88fc797477ca48446872504507c5" dependencies = [ - "atomic-waker", - "bytes", - "futures-channel", - "futures-core", - "http", - "http-body", - "httparse", - "httpdate", - "itoa", - "pin-project-lite", - "smallvec", - "tokio", -] - -[[package]] -name = "hyper-util" -version = "0.1.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96547c2556ec9d12fb1578c4eaf448b04993e7fb79cbaad930a656880a6bdfa0" -dependencies = [ - "bytes", - "http", - "http-body", - "hyper", - "pin-project-lite", - "tokio", - "tower-service", + "typenum", ] [[package]] @@ -1244,12 +1329,6 @@ version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3d3067d79b975e8844ca9eb072e16b31c3c1c36928edf9c6789548c524d0d954" -[[package]] -name = "ident_case" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" - [[package]] name = "idna" version = "1.1.0" @@ -1287,6 +1366,12 @@ dependencies = [ "winapi-util", ] +[[package]] +name = "impl-more" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8a5a9a0ff0086c7a148acb942baaabeadf9504d10400b5a05645853729b9cd2" + [[package]] name = "indexmap" version = "2.14.0" @@ -1294,7 +1379,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d466e9454f08e4a911e14806c24e16fba1b4c121d1ea474396f396069cf949d9" dependencies = [ "equivalent", - "hashbrown 0.17.1", + "hashbrown 0.17.0", "serde", "serde_core", ] @@ -1309,14 +1394,12 @@ dependencies = [ ] [[package]] -name = "inherent" -version = "1.0.13" +name = "inout" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c727f80bfa4a6c6e2508d2f05b6f4bfce242030bd88ed15ae5331c5b5d30fba7" +checksum = "879f10e63c20629ecabbb64a8010319738c66a5cd0c29b02d63d272b03751d01" dependencies = [ - "proc-macro2", - "quote", - "syn", + "generic-array", ] [[package]] @@ -1351,10 +1434,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f42a60cbdf9a97f5d2305f08a87dc4e09308d1276d28c869c684d7777685682" [[package]] -name = "js-sys" -version = "0.3.98" +name = "jobserver" +version = "0.1.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67df7112613f8bfd9150013a0314e196f4800d3201ae742489d999db2f979f08" +checksum = "9afb3de4395d6b3e67a780b6de64b51c978ecf11cb9a462c66be7d4ca9039d33" +dependencies = [ + "getrandom 0.3.4", + "libc", +] + +[[package]] +name = "js-sys" +version = "0.3.97" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1840c94c045fbcf8ba2812c95db44499f7c64910a912551aaaa541decebcacf" dependencies = [ "cfg-if", "futures-util", @@ -1362,6 +1455,12 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "language-tags" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4345964bb142484797b161f473a503a434de77149dd8c7427788c6e13379388" + [[package]] name = "lasso" version = "0.7.3" @@ -1376,9 +1475,6 @@ name = "lazy_static" version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" -dependencies = [ - "spin", -] [[package]] name = "leb128fmt" @@ -1392,35 +1488,6 @@ version = "0.2.186" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "68ab91017fe16c622486840e4c83c9a37afeff978bd239b5293d61ece587de66" -[[package]] -name = "libm" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6d2cec3eae94f9f509c767b45932f1ada8350c4bdb85af2fcab4a3c14807981" - -[[package]] -name = "libredox" -version = "0.1.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e02f3bb43d335493c96bf3fd3a321600bf6bd07ed34bc64118e9293bdffea46c" -dependencies = [ - "bitflags", - "libc", - "plain", - "redox_syscall 0.7.5", -] - -[[package]] -name = "libsqlite3-sys" -version = "0.30.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e99fb7a497b1e3339bc746195567ed8d3e24945ecd636e3619d20b9de9e9149" -dependencies = [ - "cc", - "pkg-config", - "vcpkg", -] - [[package]] name = "linux-raw-sys" version = "0.12.1" @@ -1433,6 +1500,23 @@ version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "92daf443525c4cce67b150400bc2316076100ce0b3686209eb8cf3c31612e6f0" +[[package]] +name = "local-channel" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6cbc85e69b8df4b8bb8b89ec634e7189099cea8927a276b7384ce5488e53ec8" +dependencies = [ + "futures-core", + "futures-sink", + "local-waker", +] + +[[package]] +name = "local-waker" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4d873d7c67ce09b42110d801813efbc9364414e356be9935700d368351657487" + [[package]] name = "lock_api" version = "0.4.14" @@ -1457,22 +1541,6 @@ dependencies = [ "regex-automata", ] -[[package]] -name = "matchit" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47e1ffaa40ddd1f3ed91f717a33c8c0ee23fff369e3aa8772b9605cc1d22f4c3" - -[[package]] -name = "md-5" -version = "0.10.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf" -dependencies = [ - "cfg-if", - "digest", -] - [[package]] name = "memchr" version = "2.8.0" @@ -1512,26 +1580,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "50b7e5b27aa02a74bac8c3f23f448f8d87ff11f92d3aac1a6ed369ee08cc56c1" dependencies = [ "libc", + "log", "wasi", "windows-sys 0.61.2", ] [[package]] -name = "native-tls" -version = "0.2.18" +name = "mutually_exclusive_features" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "465500e14ea162429d264d44189adc38b199b62b1c21eea9f69e4b73cb03bbf2" -dependencies = [ - "libc", - "log", - "openssl", - "openssl-probe", - "openssl-sys", - "schannel", - "security-framework", - "security-framework-sys", - "tempfile", -] +checksum = "e94e1e6445d314f972ff7395df2de295fe51b71821694f0b0e1e79c4f12c8577" [[package]] name = "nu-ansi-term" @@ -1542,48 +1600,12 @@ dependencies = [ "windows-sys 0.61.2", ] -[[package]] -name = "num-bigint-dig" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e661dda6640fad38e827a6d4a310ff4763082116fe217f279885c97f511bb0b7" -dependencies = [ - "lazy_static", - "libm", - "num-integer", - "num-iter", - "num-traits", - "rand", - "smallvec", - "zeroize", -] - [[package]] name = "num-conv" version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c6673768db2d862beb9b39a78fdcb1a69439615d5794a1be50caa9bc92c81967" -[[package]] -name = "num-integer" -version = "0.1.46" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" -dependencies = [ - "num-traits", -] - -[[package]] -name = "num-iter" -version = "0.1.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf" -dependencies = [ - "autocfg", - "num-integer", - "num-traits", -] - [[package]] name = "num-traits" version = "0.2.19" @@ -1591,7 +1613,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" dependencies = [ "autocfg", - "libm", ] [[package]] @@ -1607,86 +1628,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "384b8ab6d37215f3c5301a95a4accb5d64aa607f1fcb26a11b5303878451b4fe" [[package]] -name = "openssl" -version = "0.10.79" +name = "opaque-debug" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf0b434746ee2832f4f0baf10137e1cabb18cbe6912c69e2e33263c45250f542" -dependencies = [ - "bitflags", - "cfg-if", - "foreign-types", - "libc", - "openssl-macros", - "openssl-sys", -] - -[[package]] -name = "openssl-macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "openssl-probe" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c87def4c32ab89d880effc9e097653c8da5d6ef28e6b539d313baaacfbafcbe" - -[[package]] -name = "openssl-sys" -version = "0.9.115" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "158fe5b292746440aa6e7a7e690e55aeb72d41505e2804c23c6973ad0e9c9781" -dependencies = [ - "cc", - "libc", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "ordered-float" -version = "4.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7bb71e1b3fa6ca1c61f383464aaf2bb0e2f8e772a1f01d486832464de363b951" -dependencies = [ - "num-traits", -] - -[[package]] -name = "ouroboros" -version = "0.18.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e0f050db9c44b97a94723127e6be766ac5c340c48f2c4bb3ffa11713744be59" -dependencies = [ - "aliasable", - "ouroboros_macro", - "static_assertions", -] - -[[package]] -name = "ouroboros_macro" -version = "0.18.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c7028bdd3d43083f6d8d4d5187680d0d3560d54df4cc9d752005268b41e64d0" -dependencies = [ - "heck 0.4.1", - "proc-macro2", - "proc-macro2-diagnostics", - "quote", - "syn", -] +checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381" [[package]] name = "pagetop" version = "0.5.0" dependencies = [ - "axum", + "actix-files", + "actix-session", + "actix-web", "chrono", "colored", "config", @@ -1704,12 +1657,11 @@ dependencies = [ "parking_lot", "serde", "serde_json", + "substring", "tempfile", "terminal_size", - "tokio", - "tower", - "tower-http", "tracing", + "tracing-actix-web", "tracing-appender", "tracing-subscriber", "unic-langid", @@ -1721,7 +1673,6 @@ version = "0.1.0" dependencies = [ "pagetop", "pagetop-build", - "tokio", ] [[package]] @@ -1731,7 +1682,6 @@ dependencies = [ "pagetop", "pagetop-build", "serde", - "tokio", ] [[package]] @@ -1761,34 +1711,18 @@ dependencies = [ "pastey", ] -[[package]] -name = "pagetop-seaorm" -version = "0.0.4" -dependencies = [ - "async-trait", - "pagetop", - "sea-orm", - "sea-schema", - "serde", - "tokio", - "url", -] - [[package]] name = "pagetop-statics" version = "0.1.3" dependencies = [ + "actix-web", "change-detection", + "derive_more 0.99.20", + "futures-util", "mime_guess", "path-slash 0.2.1", ] -[[package]] -name = "parking" -version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba" - [[package]] name = "parking_lot" version = "0.12.5" @@ -1807,7 +1741,7 @@ checksum = "2621685985a2ebf1c516881c026032ac7deafcda1a2c9b7850dc81e3dfcb64c1" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.5.18", + "redox_syscall", "smallvec", "windows-link", ] @@ -1845,15 +1779,6 @@ version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "df94ce210e5bc13cb6651479fa48d14f601d9858cfe0467f43ae157023b938d3" -[[package]] -name = "pem-rfc7468" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88b39c9bfcfc231068454382784bb460aae594343fb030d46e9f50a645418412" -dependencies = [ - "base64ct", -] - [[package]] name = "percent-encoding" version = "2.3.2" @@ -1877,7 +1802,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3c80231409c20246a13fddb31776fb942c38553c51e871f8cbd687a4cfb5843d" dependencies = [ "phf_shared", - "rand", + "rand 0.8.6", ] [[package]] @@ -1902,33 +1827,32 @@ dependencies = [ "siphasher", ] +[[package]] +name = "pin-project" +version = "1.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1749c7ed4bcaf4c3d0a3efc28538844fb29bcdd7d2b67b2be7e20ba861ff517" +dependencies = [ + "pin-project-internal", +] + +[[package]] +name = "pin-project-internal" +version = "1.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9b20ed30f105399776b9c883e68e536ef602a16ae6f596d2c473591d6ad64c6" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "pin-project-lite" version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a89322df9ebe1c1578d689c92318e070967d1042b512afbe49518723f4e6d5cd" -[[package]] -name = "pkcs1" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8ffb9f10fa047879315e6625af03c164b16962a5368d724ed16323b68ace47f" -dependencies = [ - "der", - "pkcs8", - "spki", -] - -[[package]] -name = "pkcs8" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7" -dependencies = [ - "der", - "spki", -] - [[package]] name = "pkg-config" version = "0.3.33" @@ -1936,10 +1860,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "19f132c84eca552bf34cab8ec81f1c1dcc229b811638f9d283dceabe58c5569e" [[package]] -name = "plain" -version = "0.2.3" +name = "polyval" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4596b6d070b27117e987119b4dac604f3c58cfb0b191112e24771b2faeac1a6" +checksum = "9d1fe60d06143b2430aa532c94cfe9e29783047f06c0d7fd359a9a51b729fa25" +dependencies = [ + "cfg-if", + "cpufeatures 0.2.17", + "opaque-debug", + "universal-hash", +] [[package]] name = "potential_utf" @@ -1975,28 +1905,6 @@ dependencies = [ "syn", ] -[[package]] -name = "proc-macro-error-attr2" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96de42df36bb9bba5542fe9f1a054b8cc87e172759a1868aa05c1f3acc89dfc5" -dependencies = [ - "proc-macro2", - "quote", -] - -[[package]] -name = "proc-macro-error2" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11ec05c52be0a07b08061f7dd003e7d7092e0472bc731b4af7bb1ef876109802" -dependencies = [ - "proc-macro-error-attr2", - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "proc-macro-hack" version = "0.5.20+deprecated" @@ -2022,7 +1930,6 @@ dependencies = [ "quote", "syn", "version_check", - "yansi", ] [[package]] @@ -2034,6 +1941,12 @@ dependencies = [ "proc-macro2", ] +[[package]] +name = "r-efi" +version = "5.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f" + [[package]] name = "r-efi" version = "6.0.0" @@ -2047,8 +1960,29 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5ca0ecfa931c29007047d1bc58e623ab12e5590e8c7cc53200d5202b69266d8a" dependencies = [ "libc", - "rand_chacha", - "rand_core", + "rand_chacha 0.3.1", + "rand_core 0.6.4", +] + +[[package]] +name = "rand" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44c5af06bb1b7d3216d91932aed5265164bf384dc89cd6ba05cf59a35f5f76ea" +dependencies = [ + "rand_chacha 0.9.0", + "rand_core 0.9.5", +] + +[[package]] +name = "rand" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2e8e8bcc7961af1fdac401278c6a831614941f6164ee3bf4ce61b7edb162207" +dependencies = [ + "chacha20", + "getrandom 0.4.2", + "rand_core 0.10.1", ] [[package]] @@ -2058,7 +1992,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" dependencies = [ "ppv-lite86", - "rand_core", + "rand_core 0.6.4", +] + +[[package]] +name = "rand_chacha" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb" +dependencies = [ + "ppv-lite86", + "rand_core 0.9.5", ] [[package]] @@ -2070,6 +2014,21 @@ dependencies = [ "getrandom 0.2.17", ] +[[package]] +name = "rand_core" +version = "0.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76afc826de14238e6e8c374ddcc1fa19e374fd8dd986b0d2af0d02377261d83c" +dependencies = [ + "getrandom 0.3.4", +] + +[[package]] +name = "rand_core" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "63b8176103e19a2643978565ca18b50549f6101881c443590420e4dc998a3c69" + [[package]] name = "redox_syscall" version = "0.5.18" @@ -2080,12 +2039,15 @@ dependencies = [ ] [[package]] -name = "redox_syscall" -version = "0.7.5" +name = "regex" +version = "1.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4666a1a60d8412eab19d94f6d13dcc9cea0a5ef4fdf6a5db306537413c661b1b" +checksum = "e10754a14b9137dd7b1e3e5b0493cc9171fdd105e0ab477f51b72e7f3ac0e276" dependencies = [ - "bitflags", + "aho-corasick", + "memchr", + "regex-automata", + "regex-syntax", ] [[package]] @@ -2099,32 +2061,18 @@ dependencies = [ "regex-syntax", ] +[[package]] +name = "regex-lite" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cab834c73d247e67f4fae452806d17d3c7501756d98c8808d7c9c7aa7d18f973" + [[package]] name = "regex-syntax" version = "0.8.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dc897dd8d9e8bd1ed8cdad82b5966c3e0ecae09fb1907d58efaa013543185d0a" -[[package]] -name = "rsa" -version = "0.9.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8573f03f5883dcaebdfcf4725caa1ecb9c15b2ef50c43a07b816e06799bb12d" -dependencies = [ - "const-oid", - "digest", - "num-bigint-dig", - "num-integer", - "num-traits", - "pkcs1", - "pkcs8", - "rand_core", - "signature", - "spki", - "subtle", - "zeroize", -] - [[package]] name = "rustc-hash" version = "2.1.2" @@ -2174,152 +2122,12 @@ dependencies = [ "winapi-util", ] -[[package]] -name = "schannel" -version = "0.1.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91c1b7e4904c873ef0710c1f407dde2e6287de2bebc1bbbf7d430bb7cbffd939" -dependencies = [ - "windows-sys 0.61.2", -] - [[package]] name = "scopeguard" version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" -[[package]] -name = "sea-bae" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f694a6ab48f14bc063cfadff30ab551d3c7e46d8f81836c51989d548f44a2a25" -dependencies = [ - "heck 0.4.1", - "proc-macro-error2", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "sea-orm" -version = "1.1.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dc312fedd460a47ea563911761d254a84e7b51d8cc73ec92c929e78f33fa957" -dependencies = [ - "async-stream", - "async-trait", - "derive_more", - "futures-util", - "log", - "ouroboros", - "sea-orm-macros", - "sea-query", - "sea-query-binder", - "serde", - "sqlx", - "strum", - "thiserror", - "tracing", - "url", -] - -[[package]] -name = "sea-orm-macros" -version = "1.1.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b9a3f90e336ec74803e8eb98c61bc98754c1adfba3b4f84d946237b752b1c88" -dependencies = [ - "heck 0.5.0", - "proc-macro2", - "quote", - "sea-bae", - "syn", - "unicode-ident", -] - -[[package]] -name = "sea-query" -version = "0.32.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a5d1c518eaf5eda38e5773f902b26ab6d5e9e9e2bb2349ca6c64cf96f80448c" -dependencies = [ - "inherent", - "ordered-float", - "sea-query-derive", -] - -[[package]] -name = "sea-query-binder" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0019f47430f7995af63deda77e238c17323359af241233ec768aba1faea7608" -dependencies = [ - "sea-query", - "sqlx", -] - -[[package]] -name = "sea-query-derive" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bae0cbad6ab996955664982739354128c58d16e126114fe88c2a493642502aab" -dependencies = [ - "darling", - "heck 0.4.1", - "proc-macro2", - "quote", - "syn", - "thiserror", -] - -[[package]] -name = "sea-schema" -version = "0.16.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2239ff574c04858ca77485f112afea1a15e53135d3097d0c86509cef1def1338" -dependencies = [ - "futures", - "sea-query", - "sea-schema-derive", -] - -[[package]] -name = "sea-schema-derive" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "debdc8729c37fdbf88472f97fd470393089f997a909e535ff67c544d18cfccf0" -dependencies = [ - "heck 0.4.1", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "security-framework" -version = "3.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7f4bc775c73d9a02cde8bf7b2ec4c9d12743edf609006c7facc23998404cd1d" -dependencies = [ - "bitflags", - "core-foundation", - "core-foundation-sys", - "libc", - "security-framework-sys", -] - -[[package]] -name = "security-framework-sys" -version = "2.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ce2691df843ecc5d231c0b14ece2acc3efb62c0a398c7e1d875f3983ce020e3" -dependencies = [ - "core-foundation-sys", - "libc", -] - [[package]] name = "self_cell" version = "1.2.2" @@ -2375,17 +2183,6 @@ dependencies = [ "zmij", ] -[[package]] -name = "serde_path_to_error" -version = "0.1.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10a9ff822e371bb5403e391ecd83e182e0e77ba7f6fe0160b795797109d1b457" -dependencies = [ - "itoa", - "serde", - "serde_core", -] - [[package]] name = "serde_spanned" version = "1.1.1" @@ -2409,13 +2206,13 @@ dependencies = [ [[package]] name = "sha1" -version = "0.10.6" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" +checksum = "aacc4cc499359472b4abe1bf11d0b12e688af9a805fa5e3016f9a386dc2d0214" dependencies = [ "cfg-if", - "cpufeatures", - "digest", + "cpufeatures 0.3.0", + "digest 0.11.2", ] [[package]] @@ -2425,8 +2222,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a7507d819769d01a365ab707794a4084392c824f54a7a6a7862f8c3d0892b283" dependencies = [ "cfg-if", - "cpufeatures", - "digest", + "cpufeatures 0.2.17", + "digest 0.10.7", ] [[package]] @@ -2454,16 +2251,6 @@ dependencies = [ "libc", ] -[[package]] -name = "signature" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de" -dependencies = [ - "digest", - "rand_core", -] - [[package]] name = "simd-adler32" version = "0.3.9" @@ -2472,9 +2259,9 @@ checksum = "703d5c7ef118737c72f1af64ad2f6f8c5e1921f818cdcb97b8fe6fc69bf66214" [[package]] name = "siphasher" -version = "1.0.3" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ee5873ec9cce0195efcb7a4e9507a04cd49aec9c83d0389df45b1ef7ba2e649" +checksum = "b2aa850e253778c88a04c3d7323b043aeda9d3e30d5971937c1855769763678e" [[package]] name = "slab" @@ -2487,8 +2274,15 @@ name = "smallvec" version = "1.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03" + +[[package]] +name = "socket2" +version = "0.5.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e22376abed350d73dd1cd119b57ffccad95b4e585a7cda43e286245ce23c0678" dependencies = [ - "serde", + "libc", + "windows-sys 0.52.0", ] [[package]] @@ -2510,228 +2304,12 @@ dependencies = [ "lock_api", ] -[[package]] -name = "spki" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d" -dependencies = [ - "base64ct", - "der", -] - -[[package]] -name = "sqlx" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fefb893899429669dcdd979aff487bd78f4064e5e7907e4269081e0ef7d97dc" -dependencies = [ - "sqlx-core", - "sqlx-macros", - "sqlx-mysql", - "sqlx-postgres", - "sqlx-sqlite", -] - -[[package]] -name = "sqlx-core" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee6798b1838b6a0f69c007c133b8df5866302197e404e8b6ee8ed3e3a5e68dc6" -dependencies = [ - "base64", - "bytes", - "crc", - "crossbeam-queue", - "either", - "event-listener", - "futures-core", - "futures-intrusive", - "futures-io", - "futures-util", - "hashbrown 0.15.5", - "hashlink", - "indexmap", - "log", - "memchr", - "native-tls", - "once_cell", - "percent-encoding", - "serde", - "serde_json", - "sha2", - "smallvec", - "thiserror", - "tokio", - "tokio-stream", - "tracing", - "url", -] - -[[package]] -name = "sqlx-macros" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2d452988ccaacfbf5e0bdbc348fb91d7c8af5bee192173ac3636b5fb6e6715d" -dependencies = [ - "proc-macro2", - "quote", - "sqlx-core", - "sqlx-macros-core", - "syn", -] - -[[package]] -name = "sqlx-macros-core" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19a9c1841124ac5a61741f96e1d9e2ec77424bf323962dd894bdb93f37d5219b" -dependencies = [ - "dotenvy", - "either", - "heck 0.5.0", - "hex", - "once_cell", - "proc-macro2", - "quote", - "serde", - "serde_json", - "sha2", - "sqlx-core", - "sqlx-mysql", - "sqlx-postgres", - "sqlx-sqlite", - "syn", - "tokio", - "url", -] - -[[package]] -name = "sqlx-mysql" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa003f0038df784eb8fecbbac13affe3da23b45194bd57dba231c8f48199c526" -dependencies = [ - "atoi", - "base64", - "bitflags", - "byteorder", - "bytes", - "crc", - "digest", - "dotenvy", - "either", - "futures-channel", - "futures-core", - "futures-io", - "futures-util", - "generic-array", - "hex", - "hkdf", - "hmac", - "itoa", - "log", - "md-5", - "memchr", - "once_cell", - "percent-encoding", - "rand", - "rsa", - "serde", - "sha1", - "sha2", - "smallvec", - "sqlx-core", - "stringprep", - "thiserror", - "tracing", - "whoami", -] - -[[package]] -name = "sqlx-postgres" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db58fcd5a53cf07c184b154801ff91347e4c30d17a3562a635ff028ad5deda46" -dependencies = [ - "atoi", - "base64", - "bitflags", - "byteorder", - "crc", - "dotenvy", - "etcetera", - "futures-channel", - "futures-core", - "futures-util", - "hex", - "hkdf", - "hmac", - "home", - "itoa", - "log", - "md-5", - "memchr", - "once_cell", - "rand", - "serde", - "serde_json", - "sha2", - "smallvec", - "sqlx-core", - "stringprep", - "thiserror", - "tracing", - "whoami", -] - -[[package]] -name = "sqlx-sqlite" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2d12fe70b2c1b4401038055f90f151b78208de1f9f89a7dbfd41587a10c3eea" -dependencies = [ - "atoi", - "flume", - "futures-channel", - "futures-core", - "futures-executor", - "futures-intrusive", - "futures-util", - "libsqlite3-sys", - "log", - "percent-encoding", - "serde", - "serde_urlencoded", - "sqlx-core", - "thiserror", - "tracing", - "url", -] - [[package]] name = "stable_deref_trait" version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6ce2be8dc25455e1f91df71bfa12ad37d7af1092ae736f3a6cd0e37bc7810596" -[[package]] -name = "static_assertions" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" - -[[package]] -name = "stringprep" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b4df3d392d81bd458a8a621b8bffbd2302a12ffe288a9d931670948749463b1" -dependencies = [ - "unicode-bidi", - "unicode-normalization", - "unicode-properties", -] - [[package]] name = "strsim" version = "0.11.1" @@ -2739,10 +2317,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" [[package]] -name = "strum" -version = "0.26.3" +name = "substring" +version = "1.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06" +checksum = "42ee6433ecef213b2e72f587ef64a2f5943e7cd16fbd82dbe8bc07486c534c86" +dependencies = [ + "autocfg", +] [[package]] name = "subtle" @@ -2767,12 +2348,6 @@ dependencies = [ "unicode-ident", ] -[[package]] -name = "sync_wrapper" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bf256ce5efdfa370213c1dabab5935a12e49f2c58d15e9eac2870d3b4f27263" - [[package]] name = "synstructure" version = "0.13.2" @@ -2878,26 +2453,11 @@ dependencies = [ "zerovec", ] -[[package]] -name = "tinyvec" -version = "1.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e61e67053d25a4e82c844e8424039d9745781b3fc4f32b8d55ed50f5f667ef3" -dependencies = [ - "tinyvec_macros", -] - -[[package]] -name = "tinyvec_macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" - [[package]] name = "tokio" -version = "1.52.3" +version = "1.52.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fc7f01b389ac15039e4dc9531aa973a135d7a4135281b12d7c1bc79fd57fffe" +checksum = "b67dee974fe86fd92cc45b7a95fdd2f99a36a6d7b0d431a231178d3d670bbcc6" dependencies = [ "bytes", "libc", @@ -2905,33 +2465,10 @@ dependencies = [ "parking_lot", "pin-project-lite", "signal-hook-registry", - "socket2", - "tokio-macros", + "socket2 0.6.3", "windows-sys 0.61.2", ] -[[package]] -name = "tokio-macros" -version = "2.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "385a6cb71ab9ab790c5fe8d67f1645e6c450a7ce006a33de03daa956cf70a496" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "tokio-stream" -version = "0.1.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32da49809aab5c3bc678af03902d4ccddea2a87d028d86392a4b1560c6906c70" -dependencies = [ - "futures-core", - "pin-project-lite", - "tokio", -] - [[package]] name = "tokio-util" version = "0.7.18" @@ -2976,59 +2513,6 @@ dependencies = [ "winnow", ] -[[package]] -name = "tower" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebe5ef63511595f1344e2d5cfa636d973292adc0eec1f0ad45fae9f0851ab1d4" -dependencies = [ - "futures-core", - "futures-util", - "pin-project-lite", - "sync_wrapper", - "tokio", - "tower-layer", - "tower-service", - "tracing", -] - -[[package]] -name = "tower-http" -version = "0.6.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cfcf7e2740e6fc6d4d688b4ef00650406bb94adf4731e43c096c3a19fe40840" -dependencies = [ - "bitflags", - "bytes", - "futures-core", - "futures-util", - "http", - "http-body", - "http-body-util", - "http-range-header", - "httpdate", - "mime", - "mime_guess", - "percent-encoding", - "pin-project-lite", - "tokio", - "tokio-util", - "tower-layer", - "tower-service", -] - -[[package]] -name = "tower-layer" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e" - -[[package]] -name = "tower-service" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" - [[package]] name = "tracing" version = "0.1.44" @@ -3041,6 +2525,19 @@ dependencies = [ "tracing-core", ] +[[package]] +name = "tracing-actix-web" +version = "0.7.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ca6b15407f9bfcb35f82d0e79e603e1629ece4e91cc6d9e58f890c184dd20af" +dependencies = [ + "actix-web", + "mutually_exclusive_features", + "pin-project", + "tracing", + "uuid", +] + [[package]] name = "tracing-appender" version = "0.2.5" @@ -3181,12 +2678,6 @@ version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dbc4bc3a9f746d862c45cb89d705aa10f187bb96c76001afab07a0d35ce60142" -[[package]] -name = "unicode-bidi" -version = "0.3.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c1cb5db39152898a79168971543b1cb5020dff7fe43c8dc468b0885f5e29df5" - [[package]] name = "unicode-ident" version = "1.0.24" @@ -3194,19 +2685,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6e4313cd5fcd3dad5cafa179702e2b244f760991f45397d14d4ebf38247da75" [[package]] -name = "unicode-normalization" -version = "0.1.25" +name = "unicode-segmentation" +version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fd4f6878c9cb28d874b009da9e8d183b5abc80117c40bbd187a1fde336be6e8" -dependencies = [ - "tinyvec", -] - -[[package]] -name = "unicode-properties" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7df058c713841ad818f1dc5d3fd88063241cc61f49f5fbea4b951e8cf5a8d71d" +checksum = "9629274872b2bfaf8d66f5f15725007f635594914870f65218920345aa11aa8c" [[package]] name = "unicode-xid" @@ -3214,6 +2696,16 @@ version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853" +[[package]] +name = "universal-hash" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc1de2c688dc15305988b563c3854064043356019f97a4b46276fe734c4f07ea" +dependencies = [ + "crypto-common 0.1.7", + "subtle", +] + [[package]] name = "url" version = "2.5.8" @@ -3238,18 +2730,29 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" +[[package]] +name = "uuid" +version = "1.23.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ddd74a9687298c6858e9b88ec8935ec45d22e8fd5e6394fa1bd4e99a87789c76" +dependencies = [ + "getrandom 0.4.2", + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "v_htmlescape" +version = "0.15.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e8257fbc510f0a46eb602c10215901938b5c2a7d5e70fc11483b1d3c9b5b18c" + [[package]] name = "valuable" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ba73ea9cf16a25df0c8caa16c51acb937d5712a8429db78a3ee29d5dcacd3a65" -[[package]] -name = "vcpkg" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" - [[package]] name = "version_check" version = "0.9.5" @@ -3290,17 +2793,11 @@ dependencies = [ "wit-bindgen 0.51.0", ] -[[package]] -name = "wasite" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8dad83b4f25e74f184f64c43b150b91efe7647395b42289f38e50566d82855b" - [[package]] name = "wasm-bindgen" -version = "0.2.121" +version = "0.2.120" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49ace1d07c165b0864824eee619580c4689389afa9dc9ed3a4c75040d82e6790" +checksum = "df52b6d9b87e0c74c9edfa1eb2d9bf85e5d63515474513aa50fa181b3c4f5db1" dependencies = [ "cfg-if", "once_cell", @@ -3311,9 +2808,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.121" +version = "0.2.120" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e68e6f4afd367a562002c05637acb8578ff2dea1943df76afb9e83d177c8578" +checksum = "78b1041f495fb322e64aca85f5756b2172e35cd459376e67f2a6c9dffcedb103" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -3321,9 +2818,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.121" +version = "0.2.120" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d95a9ec35c64b2a7cb35d3fead40c4238d0940c86d107136999567a4703259f2" +checksum = "9dcd0ff20416988a18ac686d4d4d0f6aae9ebf08a389ff5d29012b05af2a1b41" dependencies = [ "bumpalo", "proc-macro2", @@ -3334,9 +2831,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.121" +version = "0.2.120" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4e0100b01e9f0d03189a92b96772a1fb998639d981193d7dbab487302513441" +checksum = "49757b3c82ebf16c57d69365a142940b384176c24df52a087fb748e2085359ea" dependencies = [ "unicode-ident", ] @@ -3375,16 +2872,6 @@ dependencies = [ "semver", ] -[[package]] -name = "whoami" -version = "1.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d4a4db5077702ca3015d3d02d74974948aba2ad9e12ab7df718ee64ccd7e97d" -dependencies = [ - "libredox", - "wasite", -] - [[package]] name = "winapi-util" version = "0.1.11" @@ -3455,9 +2942,9 @@ dependencies = [ [[package]] name = "windows-sys" -version = "0.48.0" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ "windows-targets", ] @@ -3473,13 +2960,14 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.48.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" dependencies = [ "windows_aarch64_gnullvm", "windows_aarch64_msvc", "windows_i686_gnu", + "windows_i686_gnullvm", "windows_i686_msvc", "windows_x86_64_gnu", "windows_x86_64_gnullvm", @@ -3488,45 +2976,51 @@ dependencies = [ [[package]] name = "windows_aarch64_gnullvm" -version = "0.48.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" [[package]] name = "windows_aarch64_msvc" -version = "0.48.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" [[package]] name = "windows_i686_gnu" -version = "0.48.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" [[package]] name = "windows_i686_msvc" -version = "0.48.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" [[package]] name = "windows_x86_64_gnu" -version = "0.48.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" [[package]] name = "windows_x86_64_gnullvm" -version = "0.48.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" [[package]] name = "windows_x86_64_msvc" -version = "0.48.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "winnow" @@ -3559,7 +3053,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ea61de684c3ea68cb082b7a88508a8b27fcc8b797d738bfc99a82facf1d752dc" dependencies = [ "anyhow", - "heck 0.5.0", + "heck", "wit-parser", ] @@ -3570,7 +3064,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b7c566e0f4b284dd6561c786d9cb0142da491f46a9fbed79ea69cdad5db17f21" dependencies = [ "anyhow", - "heck 0.5.0", + "heck", "indexmap", "prettyplease", "syn", @@ -3637,12 +3131,6 @@ version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1ffae5123b2d3fc086436f8834ae3ab053a283cfac8fe0a0b8eaae044768a4c4" -[[package]] -name = "yansi" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfe53a6657fd280eaa890a3bc59152892ffa3e30101319d168b781ed6529b049" - [[package]] name = "yoke" version = "0.8.2" @@ -3707,12 +3195,6 @@ dependencies = [ "synstructure", ] -[[package]] -name = "zeroize" -version = "1.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b97154e67e32c85465826e8bcc1c59429aaaf107c1e4a9e53c8d8ccd5eff88d0" - [[package]] name = "zerotrie" version = "0.2.4" @@ -3764,3 +3246,31 @@ name = "zmij" version = "1.0.21" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b8848ee67ecc8aedbaf3e4122217aff892639231befc6a1b58d29fff4c2cabaa" + +[[package]] +name = "zstd" +version = "0.13.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e91ee311a569c327171651566e07972200e76fcfe2242a4fa446149a3881c08a" +dependencies = [ + "zstd-safe", +] + +[[package]] +name = "zstd-safe" +version = "7.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f49c4d5f0abb602a93fb8736af2a4f4dd9512e36f7f570d66e65ff867ed3b9d" +dependencies = [ + "zstd-sys", +] + +[[package]] +name = "zstd-sys" +version = "2.0.16+zstd.1.5.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91e19ebc2adc8f83e43039e79776e3fda8ca919132d68a1fed6a5faca2683748" +dependencies = [ + "cc", + "pkg-config", +] diff --git a/Cargo.toml b/Cargo.toml index 269f752f..d809c122 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,3 +1,63 @@ +[package] +name = "pagetop" +version = "0.5.0" +edition = "2021" + +description = """ + Un entorno de desarrollo para crear soluciones web modulares, extensibles y configurables. +""" +categories = ["web-programming::http-server"] +keywords = ["pagetop", "web", "framework", "frontend", "ssr"] + +repository.workspace = true +homepage.workspace = true +license.workspace = true +authors.workspace = true + +[dependencies] +chrono = "0.4" +colored = "3.1" +config = { version = "0.15", default-features = false, features = ["toml"] } +figlet-rs = "1.0" +getter-methods = "2.0" +itoa = "1.0" +indexmap = "2.14" +parking_lot = "0.12" +substring = "1.4" +terminal_size = "0.4" + +tracing = "0.1" +tracing-appender = "0.2" +tracing-subscriber = { version = "0.3", features = ["json", "env-filter"] } +tracing-actix-web = "0.7" + +fluent-templates = "0.14" +unic-langid = { version = "0.9", features = ["macros"] } + +actix-web = { workspace = true, default-features = true } +actix-session = { version = "0.11", features = ["cookie-session"] } +actix-web-files = { package = "actix-files", version = "0.6" } + +serde.workspace = true + +pagetop-macros.workspace = true +pagetop-minimal.workspace = true +pagetop-statics.workspace = true + +[features] +default = [] +testing = [] + +[dev-dependencies] +tempfile = "3.27" +serde_json = "1.0" +pagetop-aliner.workspace = true +pagetop-bootsier.workspace = true + +[build-dependencies] +pagetop-build.workspace = true + + [workspace] resolver = "2" members = [ @@ -9,51 +69,17 @@ members = [ # Extensions "extensions/pagetop-aliner", "extensions/pagetop-bootsier", - "extensions/pagetop-seaorm", ] [workspace.package] repository = "https://git.cillero.es/manuelcillero/pagetop" homepage = "https://pagetop.cillero.es" -edition = "2024" license = "MIT OR Apache-2.0" authors = ["Manuel Cillero "] [workspace.dependencies] -async-trait = "0.1" -axum = { version = "0.8" } -change-detection = "1.2" -chrono = "0.4" -colored = "3.1" -concat-string = "1.0" -config = { version = "0.15", default-features = false, features = ["toml"] } -figlet-rs = "1.0" -fluent-templates = "0.14" -getter-methods = "2.0" -grass = "0.13" -indexmap = "2.14" -indoc = "2.0" -itoa = "1.0" -mime_guess = "2.0" -parking_lot = "0.12" -pastey = "0.2" -path-slash = "0.2" -proc-macro2 = "1.0" -proc-macro2-diagnostics = { version = "0.10", default-features = false } -quote = "1.0" +actix-web = { version = "4.13", default-features = false } serde = { version = "1.0", features = ["derive"] } -serde_json = "1.0" -syn = { version = "2.0", features = ["full", "extra-traits"] } -tempfile = "3.27" -terminal_size = "0.4" -tokio = { version = "1", features = ["full"] } -tower = { version = "0.5", features = ["util"] } -tower-http = { version = "0.6", features = ["fs"] } -tracing = "0.1" -tracing-appender = "0.2" -tracing-subscriber = { version = "0.3", features = ["json", "env-filter"] } -unic-langid = { version = "0.9", features = ["macros"] } -url = "2.5" # Helpers pagetop-build = { version = "0.3", path = "helpers/pagetop-build" } pagetop-macros = { version = "0.3", path = "helpers/pagetop-macros" } @@ -62,68 +88,5 @@ pagetop-statics = { version = "0.1", path = "helpers/pagetop-statics" } # Extensions pagetop-aliner = { version = "0.1", path = "extensions/pagetop-aliner" } pagetop-bootsier = { version = "0.1", path = "extensions/pagetop-bootsier" } -pagetop-seaorm = { version = "0.0", path = "extensions/pagetop-seaorm" } # PageTop pagetop = { version = "0.5", path = "." } - -[workspace.dependencies.sea-orm] -version = "1.1" -features = ["debug-print", "macros", "runtime-tokio-native-tls"] -default-features = false - -[workspace.dependencies.sea-schema] -version = "0.16" - - -[package] -name = "pagetop" -version = "0.5.0" - -description = """ - Un entorno de desarrollo para crear soluciones web modulares, extensibles y configurables. -""" -categories = ["web-programming::http-server"] -keywords = ["pagetop", "web", "framework", "frontend", "ssr"] - -repository.workspace = true -homepage.workspace = true -edition.workspace = true -license.workspace = true -authors.workspace = true - -[features] -default = [] -testing = [] - -[dependencies] -axum.workspace = true -chrono.workspace = true -colored.workspace = true -config.workspace = true -figlet-rs.workspace = true -fluent-templates.workspace = true -getter-methods.workspace = true -indexmap.workspace = true -itoa.workspace = true -parking_lot.workspace = true -pagetop-macros.workspace = true -pagetop-minimal.workspace = true -pagetop-statics.workspace = true -serde.workspace = true -terminal_size.workspace = true -tokio.workspace = true -tower.workspace = true -tower-http.workspace = true -tracing.workspace = true -tracing-appender.workspace = true -tracing-subscriber.workspace = true -unic-langid.workspace = true - -[dev-dependencies] -pagetop-aliner.workspace = true -pagetop-bootsier.workspace = true -serde_json.workspace = true -tempfile.workspace = true - -[build-dependencies] -pagetop-build.workspace = true diff --git a/README.md b/README.md index 89fade06..463855f2 100644 --- a/README.md +++ b/README.md @@ -11,9 +11,8 @@ [![Descargas](https://img.shields.io/crates/d/pagetop.svg?label=Descargas&style=for-the-badge&logo=transmission)](https://crates.io/crates/pagetop) [![Licencia](https://img.shields.io/badge/license-MIT%2FApache-blue.svg?label=Licencia&style=for-the-badge)](https://git.cillero.es/manuelcillero/pagetop#licencia) - -
+ PageTop reivindica la esencia de la web clásica usando [Rust](https://www.rust-lang.org/es) para la creación de soluciones web SSR (*renderizadas en el servidor*) basadas en HTML, CSS y JavaScript. @@ -59,7 +58,7 @@ impl Extension for HelloWorld { } } -async fn hello_world(request: HttpRequest) -> Result { +async fn hello_world(request: HttpRequest) -> ResultPage { Page::new(request) .add_child(Html::with(|_| html! { h1 { "Hello World!" } })) .render() @@ -110,29 +109,22 @@ El código se organiza en un *workspace* donde actualmente se incluyen los sigui tema basado en [Bootstrap](https://getbootstrap.com) para integrar su catálogo de estilos y componentes flexibles. - * **[pagetop-seaorm](https://git.cillero.es/manuelcillero/pagetop/src/branch/main/extensions/pagetop-seaorm)**, - integra [SeaORM](https://www.sea-ql.org/SeaORM) para acceder a bases de datos relacionales. - ## 🧪 Pruebas Para simplificar el flujo de trabajo, el repositorio incluye varios **alias de Cargo** declarados en `.cargo/config.toml`. Basta con ejecutarlos desde la raíz del proyecto: -| Comando | Descripción | -| ----------------------- | --------------------------------------------------------------- | -| `cargo ts` | Lanza **todos los tests** de `pagetop` | -| `cargo ts --test util` | Lanza los tests de integración del archivo `tests/util.rs` | -| `cargo ts --doc locale` | Lanza los *doctests* de `pagetop` cuyo *path* contiene `locale` | -| `cargo tw` | Lanza **todos los tests** del *workspace* | -| `cargo td ` | Lanza los *doctests* de un *crate* concreto del *workspace* | +| Comando | Descripción | +| ------- | ----------- | +| `cargo ts` | Ejecuta los tests de `pagetop` (*unit + integration*) con la *feature* `testing`. | +| `cargo ts --test util` | Lanza sólo las pruebas de integración del módulo `util`. | +| `cargo ts --doc locale` | Lanza las pruebas de la documentación del módulo `locale`. | +| `cargo tw` | Ejecuta los tests de **todos los paquetes** del *workspace*. | > **Nota** -> * Todos los alias, excepto `cargo td`, aplican la *feature* `testing` para los *crates* que la -> declaren. -> * Cuando lanza **todos los tests** se incluyen las pruebas unitarias, de integración y *doctests*. -> * Los alias suprimen las trazas del registro de eventos. Para activarlas usa directamente -> `cargo test`. +> Estos alias ya compilan con la configuración adecuada. No requieren `--no-default-features`. +> Si quieres **activar** las trazas del registro de eventos entonces usa simplemente `cargo test`. ## 🚧 Advertencia diff --git a/examples/form-controls.rs b/examples/form-controls.rs index 1c7f066e..e49844e8 100644 --- a/examples/form-controls.rs +++ b/examples/form-controls.rs @@ -1,6 +1,6 @@ use pagetop::prelude::*; -use pagetop_bootsier::theme::*; +use pagetop_bootsier::prelude::*; include_locales!(LOC from "examples/locale"); @@ -11,12 +11,12 @@ impl Extension for FormControls { vec![&pagetop_aliner::Aliner, &pagetop_bootsier::Bootsier] } - fn configure_router(&self, router: Router) -> Router { - router.route("/", web::get(form_controls)) + fn configure_service(&self, scfg: &mut service::web::ServiceConfig) { + scfg.route("/", service::web::get().to(form_controls)); } } -async fn form_controls(request: HttpRequest) -> Result { +async fn form_controls(request: HttpRequest) -> ResultPage { Page::new(request) .with_child( Intro::default() diff --git a/examples/hello-name.rs b/examples/hello-name.rs index 71439c7d..e2904c6f 100644 --- a/examples/hello-name.rs +++ b/examples/hello-name.rs @@ -3,15 +3,16 @@ use pagetop::prelude::*; struct HelloName; impl Extension for HelloName { - fn configure_router(&self, router: Router) -> Router { - router.route("/hello/{name}", web::get(hello_name)) + fn configure_service(&self, scfg: &mut service::web::ServiceConfig) { + scfg.route("/hello/{name}", service::web::get().to(hello_name)); } } async fn hello_name( request: HttpRequest, - web::Path(name): web::Path, -) -> Result { + path: service::web::Path, +) -> ResultPage { + let name = path.into_inner(); Page::new(request) .with_child(Html::with(move |_| { html! { diff --git a/examples/hello-world.rs b/examples/hello-world.rs index f1c40d23..e6127af9 100644 --- a/examples/hello-world.rs +++ b/examples/hello-world.rs @@ -3,12 +3,12 @@ use pagetop::prelude::*; struct HelloWorld; impl Extension for HelloWorld { - fn configure_router(&self, router: Router) -> Router { - router.route("/", web::get(hello_world)) + fn configure_service(&self, scfg: &mut service::web::ServiceConfig) { + scfg.route("/", service::web::get().to(hello_world)); } } -async fn hello_world(request: HttpRequest) -> Result { +async fn hello_world(request: HttpRequest) -> ResultPage { Page::new(request) .with_child(Html::with(|_| { html! { diff --git a/examples/intro-colors.rs b/examples/intro-colors.rs index b219c5be..57ddeed4 100644 --- a/examples/intro-colors.rs +++ b/examples/intro-colors.rs @@ -5,12 +5,12 @@ include_locales!(LOC from "examples/locale"); struct IntroColors; impl Extension for IntroColors { - fn configure_router(&self, router: Router) -> Router { - router.route("/", web::get(intro_colors)) + fn configure_service(&self, scfg: &mut service::web::ServiceConfig) { + scfg.route("/", service::web::get().to(intro_colors)); } } -async fn intro_colors(request: HttpRequest) -> Result { +async fn intro_colors(request: HttpRequest) -> ResultPage { Page::new(request) .with_child( Intro::default() diff --git a/examples/navbar-menus.rs b/examples/navbar-menus.rs index 7f8ccdda..a0d85f3b 100644 --- a/examples/navbar-menus.rs +++ b/examples/navbar-menus.rs @@ -1,6 +1,6 @@ use pagetop::prelude::*; -use pagetop_bootsier::theme::*; +use pagetop_bootsier::prelude::*; include_locales!(LOC from "examples/locale"); @@ -8,11 +8,7 @@ struct SuperMenu; impl Extension for SuperMenu { fn dependencies(&self) -> Vec { - vec![ - &pagetop_aliner::Aliner, - &pagetop_bootsier::Bootsier, - &pagetop::base::extension::Welcome, - ] + vec![&pagetop_aliner::Aliner, &pagetop_bootsier::Bootsier] } fn initialize(&self) { diff --git a/extensions/pagetop-aliner/Cargo.toml b/extensions/pagetop-aliner/Cargo.toml index d2828b3f..00deda3e 100644 --- a/extensions/pagetop-aliner/Cargo.toml +++ b/extensions/pagetop-aliner/Cargo.toml @@ -1,6 +1,7 @@ [package] name = "pagetop-aliner" version = "0.1.0" +edition = "2021" description = """ Tema de PageTop que muestra esquemáticamente la composición de las páginas HTML @@ -10,15 +11,11 @@ keywords = ["pagetop", "theme", "css"] repository.workspace = true homepage.workspace = true -edition.workspace = true license.workspace = true authors.workspace = true [dependencies] pagetop.workspace = true -[dev-dependencies] -tokio.workspace = true - [build-dependencies] pagetop-build.workspace = true diff --git a/extensions/pagetop-aliner/README.md b/extensions/pagetop-aliner/README.md index bf515d66..09a337eb 100644 --- a/extensions/pagetop-aliner/README.md +++ b/extensions/pagetop-aliner/README.md @@ -9,6 +9,7 @@ [![Descargas](https://img.shields.io/crates/d/pagetop-aliner.svg?label=Descargas&style=for-the-badge&logo=transmission)](https://crates.io/crates/pagetop-aliner) [![Licencia](https://img.shields.io/badge/license-MIT%2FApache-blue.svg?label=Licencia&style=for-the-badge)](https://git.cillero.es/manuelcillero/pagetop/src/branch/main/extensions/pagetop-aliner#licencia) +
## 🧭 Sobre PageTop @@ -64,7 +65,7 @@ o **fuerza el tema por código** en una página concreta: use pagetop::prelude::*; use pagetop_aliner::Aliner; -async fn homepage(request: HttpRequest) -> Result { +async fn homepage(request: HttpRequest) -> ResultPage { Page::new(request) .with_theme(&Aliner) .add_child( diff --git a/extensions/pagetop-aliner/src/lib.rs b/extensions/pagetop-aliner/src/lib.rs index dedf4e19..95f22196 100644 --- a/extensions/pagetop-aliner/src/lib.rs +++ b/extensions/pagetop-aliner/src/lib.rs @@ -66,7 +66,7 @@ o **fuerza el tema por código** en una página concreta: use pagetop::prelude::*; use pagetop_aliner::Aliner; -async fn homepage(request: HttpRequest) -> Result { +async fn homepage(request: HttpRequest) -> ResultPage { Page::new(request) .with_theme(&Aliner) .with_child( @@ -83,12 +83,9 @@ async fn homepage(request: HttpRequest) -> Result { use pagetop::prelude::*; -include_locales!(LOCALES_ALINER); - -/// Implementa el tema. +/// Implementa el tema para usar en pruebas que muestran el esquema de páginas HTML. /// -/// Define un tema mínimo que muestra esquemáticamente la composición de las páginas HTML; útil -/// para: +/// Define un tema mínimo útil para: /// /// - Comprobar el funcionamiento de temas, plantillas y regiones. /// - Verificar integración de componentes y composiciones (*layouts*) sin estilos complejos. @@ -97,33 +94,24 @@ include_locales!(LOCALES_ALINER); pub struct Aliner; impl Extension for Aliner { - fn name(&self) -> L10n { - L10n::t("extension_name", &LOCALES_ALINER) - } - - fn description(&self) -> L10n { - L10n::t("extension_description", &LOCALES_ALINER) - } - fn theme(&self) -> Option { Some(&Self) } - fn configure_router(&self, router: Router) -> Router { - serve_static_files!(router, [aliner] => "/aliner"); - router + fn configure_service(&self, scfg: &mut service::web::ServiceConfig) { + static_files_service!(scfg, [aliner] => "/aliner"); } } impl Theme for Aliner { fn before_render_page_body(&self, page: &mut Page) { page.alter_assets(AssetsOp::AddStyleSheet( - StyleSheet::from("/pagetop/css/normalize.css") + StyleSheet::from("/css/normalize.css") .with_version("8.0.1") .with_weight(-99), )) .alter_assets(AssetsOp::AddStyleSheet( - StyleSheet::from("/pagetop/css/basic.css") + StyleSheet::from("/css/basic.css") .with_version(PAGETOP_VERSION) .with_weight(-99), )) diff --git a/extensions/pagetop-aliner/src/locale/en-US/extension.ftl b/extensions/pagetop-aliner/src/locale/en-US/extension.ftl deleted file mode 100644 index e4fca26d..00000000 --- a/extensions/pagetop-aliner/src/locale/en-US/extension.ftl +++ /dev/null @@ -1,2 +0,0 @@ -extension_name = Aliner -extension_description = Minimal theme that schematically shows the HTML page composition. diff --git a/extensions/pagetop-aliner/src/locale/es-ES/extension.ftl b/extensions/pagetop-aliner/src/locale/es-ES/extension.ftl deleted file mode 100644 index 5501e15a..00000000 --- a/extensions/pagetop-aliner/src/locale/es-ES/extension.ftl +++ /dev/null @@ -1,2 +0,0 @@ -extension_name = Aliner -extension_description = Tema mínimo que muestra esquemáticamente la composición de las páginas HTML. \ No newline at end of file diff --git a/extensions/pagetop-bootsier/Cargo.toml b/extensions/pagetop-bootsier/Cargo.toml index 44b6d248..6e6fc66b 100644 --- a/extensions/pagetop-bootsier/Cargo.toml +++ b/extensions/pagetop-bootsier/Cargo.toml @@ -1,6 +1,7 @@ [package] name = "pagetop-bootsier" version = "0.1.1" +edition = "2021" description = """ Tema de PageTop basado en Bootstrap para aplicar su catálogo de estilos y componentes flexibles. @@ -10,7 +11,6 @@ keywords = ["pagetop", "theme", "bootstrap", "css", "js"] repository.workspace = true homepage.workspace = true -edition.workspace = true license.workspace = true authors.workspace = true @@ -18,8 +18,5 @@ authors.workspace = true pagetop.workspace = true serde.workspace = true -[dev-dependencies] -tokio.workspace = true - [build-dependencies] pagetop-build.workspace = true diff --git a/extensions/pagetop-bootsier/README.md b/extensions/pagetop-bootsier/README.md index f71f221e..b34eeb51 100644 --- a/extensions/pagetop-bootsier/README.md +++ b/extensions/pagetop-bootsier/README.md @@ -9,6 +9,7 @@ [![Descargas](https://img.shields.io/crates/d/pagetop-bootsier.svg?label=Descargas&style=for-the-badge&logo=transmission)](https://crates.io/crates/pagetop-bootsier) [![Licencia](https://img.shields.io/badge/license-MIT%2FApache-blue.svg?label=Licencia&style=for-the-badge)](https://git.cillero.es/manuelcillero/pagetop/src/branch/main/extensions/pagetop-bootsier#licencia) +
## 🧭 Sobre PageTop @@ -64,7 +65,7 @@ o **fuerza el tema por código** en una página concreta: use pagetop::prelude::*; use pagetop_bootsier::Bootsier; -async fn homepage(request: HttpRequest) -> Result { +async fn homepage(request: HttpRequest) -> ResultPage { Page::new(request) .with_theme(&Bootsier) .add_child( @@ -79,13 +80,6 @@ async fn homepage(request: HttpRequest) -> Result { ``` -## 📚 Créditos - -Este *crate* integra la biblioteca de estilos [Bootstrap 5.3.8](https://getbootstrap.com/) para -definir el comportamiento, la apariencia y los componentes de la interfaz. Bootstrap se distribuye -bajo licencia [MIT](https://github.com/twbs/bootstrap/blob/main/LICENSE). - - ## 🚧 Advertencia **PageTop** es un proyecto personal para aprender [Rust](https://www.rust-lang.org/es) y conocer su diff --git a/extensions/pagetop-bootsier/src/config.rs b/extensions/pagetop-bootsier/src/config.rs index 14ee27e1..6c2365ba 100644 --- a/extensions/pagetop-bootsier/src/config.rs +++ b/extensions/pagetop-bootsier/src/config.rs @@ -28,14 +28,13 @@ include_config!(SETTINGS: Settings => [ "bootsier.max_width" => "1440px", ]); -/// Ajustes para la sección [`Bootsier`] de [`SETTINGS`]. #[derive(Debug, Deserialize)] +/// Tipos para la sección [`[bootsier]`](Bootsier) de [`SETTINGS`]. pub struct Settings { pub bootsier: Bootsier, } - -/// Sección **`[bootsier]`** de la configuración. Forma parte de [`Settings`]. #[derive(Debug, Deserialize)] +/// Sección `[bootsier]` de la configuración. Forma parte de [`Settings`]. pub struct Bootsier { /// Ancho máximo predeterminado para la página, por ejemplo "100%" o "90rem". pub max_width: UnitValue, diff --git a/extensions/pagetop-bootsier/src/lib.rs b/extensions/pagetop-bootsier/src/lib.rs index 8c0ec847..d562ec09 100644 --- a/extensions/pagetop-bootsier/src/lib.rs +++ b/extensions/pagetop-bootsier/src/lib.rs @@ -66,7 +66,7 @@ o **fuerza el tema por código** en una página concreta: use pagetop::prelude::*; use pagetop_bootsier::Bootsier; -async fn homepage(request: HttpRequest) -> Result { +async fn homepage(request: HttpRequest) -> ResultPage { Page::new(request) .with_theme(&Bootsier) .with_child( @@ -96,6 +96,12 @@ pub mod config; pub mod theme; +/// *Prelude* del tema. +pub mod prelude { + pub use crate::config::*; + pub use crate::theme::*; +} + /// Plantillas que Bootsier añade. #[derive(AutoDefault)] pub enum BootsierTemplate { @@ -128,22 +134,13 @@ impl Template for BootsierTemplate { pub struct Bootsier; impl Extension for Bootsier { - fn name(&self) -> L10n { - L10n::t("extension_name", &LOCALES_BOOTSIER) - } - - fn description(&self) -> L10n { - L10n::t("extension_description", &LOCALES_BOOTSIER) - } - fn theme(&self) -> Option { Some(&Self) } - fn configure_router(&self, router: Router) -> Router { - serve_static_files!(router, [bootsier_bs] => "/bootsier/bs"); - serve_static_files!(router, [bootsier_js] => "/bootsier/js"); - router + fn configure_service(&self, scfg: &mut service::web::ServiceConfig) { + static_files_service!(scfg, [bootsier_bs] => "/bootsier/bs"); + static_files_service!(scfg, [bootsier_js] => "/bootsier/js"); } } diff --git a/extensions/pagetop-bootsier/src/locale/en-US/extension.ftl b/extensions/pagetop-bootsier/src/locale/en-US/extension.ftl deleted file mode 100644 index b2820621..00000000 --- a/extensions/pagetop-bootsier/src/locale/en-US/extension.ftl +++ /dev/null @@ -1,2 +0,0 @@ -extension_name = Bootsier -extension_description = Bootstrap-based theme with flexible styles and components. diff --git a/extensions/pagetop-bootsier/src/locale/es-ES/extension.ftl b/extensions/pagetop-bootsier/src/locale/es-ES/extension.ftl deleted file mode 100644 index 7323cc1b..00000000 --- a/extensions/pagetop-bootsier/src/locale/es-ES/extension.ftl +++ /dev/null @@ -1,2 +0,0 @@ -extension_name = Bootsier -extension_description = Tema basado en Bootstrap para aplicar su catálogo de estilos y componentes flexibles. diff --git a/extensions/pagetop-bootsier/src/theme/attrs/border.rs b/extensions/pagetop-bootsier/src/theme/attrs/border.rs index af66db78..b46a5c6b 100644 --- a/extensions/pagetop-bootsier/src/theme/attrs/border.rs +++ b/extensions/pagetop-bootsier/src/theme/attrs/border.rs @@ -58,7 +58,7 @@ impl BorderColor { /// # Ejemplos /// /// ```rust - /// # use pagetop_bootsier::theme::*; + /// # use pagetop_bootsier::prelude::*; /// assert_eq!(BorderColor::Theme(Color::Primary).to_class(), "border-primary"); /// assert_eq!(BorderColor::Subtle(Color::Warning).to_class(), "border-warning-subtle"); /// assert_eq!(BorderColor::Black.to_class(), "border-black"); diff --git a/extensions/pagetop-bootsier/src/theme/attrs/breakpoint.rs b/extensions/pagetop-bootsier/src/theme/attrs/breakpoint.rs index ec2c8568..992f8525 100644 --- a/extensions/pagetop-bootsier/src/theme/attrs/breakpoint.rs +++ b/extensions/pagetop-bootsier/src/theme/attrs/breakpoint.rs @@ -70,7 +70,7 @@ impl BreakPoint { /// # Ejemplos /// /// ```rust - /// # use pagetop_bootsier::theme::*; + /// # use pagetop_bootsier::prelude::*; /// let bp = BreakPoint::MD; /// assert_eq!(bp.class_with("col", ""), "col-md"); /// assert_eq!(bp.class_with("col", "6"), "col-md-6"); diff --git a/extensions/pagetop-bootsier/src/theme/attrs/button.rs b/extensions/pagetop-bootsier/src/theme/attrs/button.rs index 01e0dd57..dc74fbea 100644 --- a/extensions/pagetop-bootsier/src/theme/attrs/button.rs +++ b/extensions/pagetop-bootsier/src/theme/attrs/button.rs @@ -76,7 +76,7 @@ impl ButtonColor { /// # Ejemplos /// /// ```rust - /// # use pagetop_bootsier::theme::*; + /// # use pagetop_bootsier::prelude::*; /// assert_eq!( /// ButtonColor::Background(Color::Primary).to_class(), /// "btn-primary" @@ -132,7 +132,7 @@ impl ButtonSize { /// # Ejemplos /// /// ```rust - /// # use pagetop_bootsier::theme::*; + /// # use pagetop_bootsier::prelude::*; /// assert_eq!(ButtonSize::Small.to_class(), "btn-sm"); /// assert_eq!(ButtonSize::Large.to_class(), "btn-lg"); /// assert_eq!(ButtonSize::Default.to_class(), ""); diff --git a/extensions/pagetop-bootsier/src/theme/attrs/color.rs b/extensions/pagetop-bootsier/src/theme/attrs/color.rs index eb9f57d4..c408aadc 100644 --- a/extensions/pagetop-bootsier/src/theme/attrs/color.rs +++ b/extensions/pagetop-bootsier/src/theme/attrs/color.rs @@ -44,7 +44,7 @@ impl Color { /// # Ejemplos /// /// ```rust - /// # use pagetop_bootsier::theme::*; + /// # use pagetop_bootsier::prelude::*; /// assert_eq!(Color::Primary.to_class(), "primary"); /// assert_eq!(Color::Danger.to_class(), "danger"); /// ``` @@ -124,7 +124,7 @@ impl Opacity { /// # Ejemplos /// /// ```rust - /// # use pagetop_bootsier::theme::*; + /// # use pagetop_bootsier::prelude::*; /// assert_eq!(Opacity::Opaque.class_with(""), "opacity-100"); /// assert_eq!(Opacity::Half.class_with("bg"), "bg-opacity-50"); /// assert_eq!(Opacity::SemiTransparent.class_with("text"), "text-opacity-25"); @@ -156,7 +156,7 @@ impl Opacity { /// # Ejemplos /// /// ```rust - /// # use pagetop_bootsier::theme::*; + /// # use pagetop_bootsier::prelude::*; /// assert_eq!(Opacity::Opaque.to_class(), "opacity-100"); /// assert_eq!(Opacity::Half.to_class(), "opacity-50"); /// assert_eq!(Opacity::Default.to_class(), ""); @@ -237,7 +237,7 @@ impl ColorBg { /// # Ejemplos /// /// ```rust - /// # use pagetop_bootsier::theme::*; + /// # use pagetop_bootsier::prelude::*; /// assert_eq!(ColorBg::Body.to_class(), "bg-body"); /// assert_eq!(ColorBg::Theme(Color::Primary).to_class(), "bg-primary"); /// assert_eq!(ColorBg::Subtle(Color::Warning).to_class(), "bg-warning-subtle"); @@ -321,7 +321,7 @@ impl ColorText { /// # Ejemplos /// /// ```rust - /// # use pagetop_bootsier::theme::*; + /// # use pagetop_bootsier::prelude::*; /// assert_eq!(ColorText::Body.to_class(), "text-body"); /// assert_eq!(ColorText::Theme(Color::Primary).to_class(), "text-primary"); /// assert_eq!(ColorText::Emphasis(Color::Danger).to_class(), "text-danger-emphasis"); diff --git a/extensions/pagetop-bootsier/src/theme/attrs/layout.rs b/extensions/pagetop-bootsier/src/theme/attrs/layout.rs index 81b07834..a1255dc0 100644 --- a/extensions/pagetop-bootsier/src/theme/attrs/layout.rs +++ b/extensions/pagetop-bootsier/src/theme/attrs/layout.rs @@ -61,7 +61,7 @@ impl ScaleSize { /// # Ejemplo /// /// ```rust - /// # use pagetop_bootsier::theme::*; + /// # use pagetop_bootsier::prelude::*; /// assert_eq!(ScaleSize::Auto.class_with("border"), "border"); /// assert_eq!(ScaleSize::Zero.class_with("m"), "m-0"); /// assert_eq!(ScaleSize::Three.class_with("p"), "p-3"); diff --git a/extensions/pagetop-bootsier/src/theme/attrs/rounded.rs b/extensions/pagetop-bootsier/src/theme/attrs/rounded.rs index 2a959767..69976142 100644 --- a/extensions/pagetop-bootsier/src/theme/attrs/rounded.rs +++ b/extensions/pagetop-bootsier/src/theme/attrs/rounded.rs @@ -71,7 +71,7 @@ impl RoundedRadius { /// # Ejemplos /// /// ```rust - /// # use pagetop_bootsier::theme::*; + /// # use pagetop_bootsier::prelude::*; /// assert_eq!(RoundedRadius::Scale2.class_with(""), "rounded-2"); /// assert_eq!(RoundedRadius::Zero.class_with("rounded-top"), "rounded-top-0"); /// assert_eq!(RoundedRadius::Scale3.class_with("rounded-top-end"), "rounded-top-end-3"); @@ -103,7 +103,7 @@ impl RoundedRadius { /// # Ejemplos /// /// ```rust - /// # use pagetop_bootsier::theme::*; + /// # use pagetop_bootsier::prelude::*; /// assert_eq!(RoundedRadius::Default.to_class(), "rounded"); /// assert_eq!(RoundedRadius::Zero.to_class(), "rounded-0"); /// assert_eq!(RoundedRadius::Scale3.to_class(), "rounded-3"); diff --git a/extensions/pagetop-bootsier/src/theme/button.rs b/extensions/pagetop-bootsier/src/theme/button.rs index e494c1df..48eb7283 100644 --- a/extensions/pagetop-bootsier/src/theme/button.rs +++ b/extensions/pagetop-bootsier/src/theme/button.rs @@ -19,9 +19,8 @@ use crate::theme::{ButtonAction, ButtonColor, ButtonSize}; /// # Ejemplo /// /// ```rust -/// use pagetop::prelude::*; -/// use pagetop_bootsier::theme::*; -/// +/// # use pagetop::prelude::*; +/// # use pagetop_bootsier::prelude::*; /// let save = Button::submit(L10n::n("Save")) /// .with_color(ButtonColor::Background(Color::Primary)); /// diff --git a/extensions/pagetop-bootsier/src/theme/classes/border.rs b/extensions/pagetop-bootsier/src/theme/classes/border.rs index bfa65522..8a6bd6c4 100644 --- a/extensions/pagetop-bootsier/src/theme/classes/border.rs +++ b/extensions/pagetop-bootsier/src/theme/classes/border.rs @@ -26,33 +26,45 @@ use crate::theme::attrs::{BorderColor, Opacity, ScaleSize, Side}; /// /// # Ejemplos /// +/// **Borde global:** /// ```rust -/// use pagetop_bootsier::theme::*; -/// -/// // Borde global. +/// # use pagetop_bootsier::prelude::*; /// let b = classes::Border::with(ScaleSize::Two); /// assert_eq!(b.to_class(), "border-2"); +/// ``` /// -/// // Aditivo (sólo borde superior): +/// **Aditivo (solo borde superior):** +/// ```rust +/// # use pagetop_bootsier::prelude::*; /// let b = classes::Border::default().with_side(Side::Top, ScaleSize::One); /// assert_eq!(b.to_class(), "border-top-1"); +/// ``` /// -/// // Sustractivo (borde global menos el superior): +/// **Sustractivo (borde global menos el superior):** +/// ```rust +/// # use pagetop_bootsier::prelude::*; /// let b = classes::Border::new().with_side(Side::Top, ScaleSize::Zero); /// assert_eq!(b.to_class(), "border border-top-0"); +/// ``` /// -/// // Ancho por lado (lado lógico inicial a 2 y final a 4): +/// **Ancho por lado (lado lógico inicial a 2 y final a 4):** +/// ```rust +/// # use pagetop_bootsier::prelude::*; /// let b = classes::Border::default() /// .with_side(Side::Start, ScaleSize::Two) /// .with_side(Side::End, ScaleSize::Four); /// assert_eq!(b.to_class(), "border-end-4 border-start-2"); +/// ``` /// -/// // Combinado (ejemplo completo): +/// **Combinado (ejemplo completo):** +/// ```rust +/// # use pagetop_bootsier::prelude::*; /// let b = classes::Border::new() // Borde por defecto. /// .with_side(Side::Top, ScaleSize::Zero) // Quita borde superior. /// .with_side(Side::End, ScaleSize::Three) // Ancho 3 para el lado lógico final. /// .with_color(BorderColor::Theme(Color::Primary)) /// .with_opacity(Opacity::Half); +/// /// assert_eq!(b.to_class(), "border border-top-0 border-end-3 border-primary border-opacity-50"); /// ``` #[rustfmt::skip] @@ -146,7 +158,7 @@ impl Border { /// # Ejemplos /// /// ```rust -/// # use pagetop_bootsier::theme::*; +/// # use pagetop_bootsier::prelude::*; /// // Convertir explícitamente con `From::from`: /// let b = classes::Border::from(ScaleSize::Two); /// assert_eq!(b.to_class(), "border-2"); diff --git a/extensions/pagetop-bootsier/src/theme/classes/color.rs b/extensions/pagetop-bootsier/src/theme/classes/color.rs index 10638a52..4776ca9f 100644 --- a/extensions/pagetop-bootsier/src/theme/classes/color.rs +++ b/extensions/pagetop-bootsier/src/theme/classes/color.rs @@ -9,8 +9,7 @@ use crate::theme::attrs::{ColorBg, ColorText, Opacity}; /// # Ejemplos /// /// ``` -/// use pagetop_bootsier::theme::*; -/// +/// # use pagetop_bootsier::prelude::*; /// // Sin clases. /// let s = classes::Background::new(); /// assert_eq!(s.to_class(), ""); @@ -91,7 +90,7 @@ impl From<(ColorBg, Opacity)> for Background { /// # Ejemplo /// /// ``` - /// # use pagetop_bootsier::theme::*; + /// # use pagetop_bootsier::prelude::*; /// let s: classes::Background = (ColorBg::White, Opacity::SemiTransparent).into(); /// assert_eq!(s.to_class(), "bg-white bg-opacity-25"); /// ``` @@ -106,7 +105,7 @@ impl From for Background { /// # Ejemplo /// /// ``` - /// # use pagetop_bootsier::theme::*; + /// # use pagetop_bootsier::prelude::*; /// let s: classes::Background = ColorBg::Black.into(); /// assert_eq!(s.to_class(), "bg-black"); /// ``` @@ -122,8 +121,7 @@ impl From for Background { /// # Ejemplos /// /// ``` -/// use pagetop_bootsier::theme::*; -/// +/// # use pagetop_bootsier::prelude::*; /// // Sin clases. /// let s = classes::Text::new(); /// assert_eq!(s.to_class(), ""); @@ -204,7 +202,7 @@ impl From<(ColorText, Opacity)> for Text { /// # Ejemplo /// /// ``` - /// # use pagetop_bootsier::theme::*; + /// # use pagetop_bootsier::prelude::*; /// let s: classes::Text = (ColorText::Theme(Color::Danger), Opacity::Opaque).into(); /// assert_eq!(s.to_class(), "text-danger text-opacity-100"); /// ``` @@ -220,7 +218,7 @@ impl From for Text { /// # Ejemplo /// /// ``` - /// # use pagetop_bootsier::theme::*; + /// # use pagetop_bootsier::prelude::*; /// let s: classes::Text = ColorText::Black.into(); /// assert_eq!(s.to_class(), "text-black"); /// ``` diff --git a/extensions/pagetop-bootsier/src/theme/classes/layout.rs b/extensions/pagetop-bootsier/src/theme/classes/layout.rs index 1438b210..2a927acc 100644 --- a/extensions/pagetop-bootsier/src/theme/classes/layout.rs +++ b/extensions/pagetop-bootsier/src/theme/classes/layout.rs @@ -1,7 +1,7 @@ use pagetop::prelude::*; -use crate::theme::BreakPoint; use crate::theme::attrs::{ScaleSize, Side}; +use crate::theme::BreakPoint; // **< Margin >************************************************************************************* @@ -10,8 +10,7 @@ use crate::theme::attrs::{ScaleSize, Side}; /// # Ejemplos /// /// ```rust -/// use pagetop_bootsier::theme::*; -/// +/// # use pagetop_bootsier::prelude::*; /// let m = classes::Margin::with(Side::Top, ScaleSize::Three); /// assert_eq!(m.to_class(), "mt-3"); /// @@ -98,8 +97,7 @@ impl Margin { /// # Ejemplos /// /// ```rust -/// use pagetop_bootsier::theme::*; -/// +/// # use pagetop_bootsier::prelude::*; /// let p = classes::Padding::with(Side::LeftAndRight, ScaleSize::Two); /// assert_eq!(p.to_class(), "px-2"); /// diff --git a/extensions/pagetop-bootsier/src/theme/classes/rounded.rs b/extensions/pagetop-bootsier/src/theme/classes/rounded.rs index 9fcb544e..16213e01 100644 --- a/extensions/pagetop-bootsier/src/theme/classes/rounded.rs +++ b/extensions/pagetop-bootsier/src/theme/classes/rounded.rs @@ -14,30 +14,42 @@ use crate::theme::attrs::RoundedRadius; /// /// # Ejemplos /// +/// **Radio global:** /// ```rust -/// use pagetop_bootsier::theme::*; -/// -/// // Radio global: +/// # use pagetop_bootsier::prelude::*; /// let r = classes::Rounded::with(RoundedRadius::Default); /// assert_eq!(r.to_class(), "rounded"); +/// ``` /// -/// // Sin redondeo: +/// **Sin redondeo:** +/// ```rust +/// # use pagetop_bootsier::prelude::*; /// let r = classes::Rounded::new(); /// assert_eq!(r.to_class(), ""); +/// ``` /// -/// // Radio en las esquinas de un lado lógico: +/// **Radio en las esquinas de un lado lógico:** +/// ```rust +/// # use pagetop_bootsier::prelude::*; /// let r = classes::Rounded::new().with_end(RoundedRadius::Scale2); /// assert_eq!(r.to_class(), "rounded-end-2"); +/// ``` /// -/// // Radio en una esquina concreta: +/// **Radio en una esquina concreta:** +/// ```rust +/// # use pagetop_bootsier::prelude::*; /// let r = classes::Rounded::new().with_top_start(RoundedRadius::Scale3); /// assert_eq!(r.to_class(), "rounded-top-start-3"); +/// ``` /// -/// // Combinado (ejemplo completo): +/// **Combinado (ejemplo completo):** +/// ```rust +/// # use pagetop_bootsier::prelude::*; /// let r = classes::Rounded::new() /// .with_top(RoundedRadius::Default) // Añade redondeo arriba. /// .with_bottom_start(RoundedRadius::Scale4) // Añade una esquina redondeada concreta. /// .with_bottom_end(RoundedRadius::Circle); // Añade redondeo extremo en otra esquina. +/// /// assert_eq!(r.to_class(), "rounded-top rounded-bottom-start-4 rounded-bottom-end-circle"); /// ``` #[rustfmt::skip] diff --git a/extensions/pagetop-bootsier/src/theme/container.rs b/extensions/pagetop-bootsier/src/theme/container.rs index 707fdc4f..a860110f 100644 --- a/extensions/pagetop-bootsier/src/theme/container.rs +++ b/extensions/pagetop-bootsier/src/theme/container.rs @@ -6,6 +6,16 @@ //! Con [`container::Width`](crate::theme::container::Width) se puede definir el ancho y el //! comportamiento *responsive* del contenedor. También permite aplicar utilidades de estilo para el //! fondo, texto, borde o esquinas redondeadas. +//! +//! # Ejemplo +//! +//! ```rust +//! # use pagetop::prelude::*; +//! # use pagetop_bootsier::prelude::*; +//! let main = Container::main() +//! .with_id("main-page") +//! .with_width(container::Width::From(BreakPoint::LG)); +//! ``` mod props; pub use props::{Kind, Width}; diff --git a/extensions/pagetop-bootsier/src/theme/container/component.rs b/extensions/pagetop-bootsier/src/theme/container/component.rs index 9e4e33c0..0635ad18 100644 --- a/extensions/pagetop-bootsier/src/theme/container/component.rs +++ b/extensions/pagetop-bootsier/src/theme/container/component.rs @@ -1,23 +1,11 @@ use pagetop::prelude::*; -use crate::theme::*; +use crate::prelude::*; -/// Componente para crear un **contenedor de componentes** ([`container`]). +/// Componente para crear un **contenedor de componentes**. /// -/// Envuelve un conjunto de componentes en un contenedor establecido que se crea aplicando uno de -/// los tipos definidos en [`container::Kind`]. -/// -/// Si no contiene elementos, el componente **no se renderiza**. -/// -/// # Ejemplo -/// -/// ```rust -/// use pagetop_bootsier::theme::*; -/// -/// let main = Container::main() -/// .with_id("main-page") -/// .with_width(container::Width::From(BreakPoint::LG)); -/// ``` +/// Envuelve un contenido con la etiqueta HTML indicada por [`container::Kind`]. Sólo se renderiza +/// si existen componentes hijos (*children*). #[derive(AutoDefault, Clone, Debug, Getters)] pub struct Container { #[getters(skip)] diff --git a/extensions/pagetop-bootsier/src/theme/dropdown.rs b/extensions/pagetop-bootsier/src/theme/dropdown.rs index c8e27870..213756c7 100644 --- a/extensions/pagetop-bootsier/src/theme/dropdown.rs +++ b/extensions/pagetop-bootsier/src/theme/dropdown.rs @@ -1,4 +1,4 @@ -//! Definiciones para crear menús desplegables ([`Dropdown`]). +//! Definiciones para crear menús desplegables [`Dropdown`]. //! //! Cada [`dropdown::Item`](crate::theme::dropdown::Item) representa un elemento individual del //! desplegable [`Dropdown`], con distintos comportamientos según su finalidad, como enlaces de @@ -6,6 +6,23 @@ //! //! Los ítems pueden estar activos, deshabilitados o abrirse en nueva ventana según su contexto y //! configuración, y permiten incluir etiquetas localizables usando [`L10n`](pagetop::locale::L10n). +//! +//! # Ejemplo +//! +//! ```rust +//! # use pagetop::prelude::*; +//! # use pagetop_bootsier::prelude::*; +//! let dd = Dropdown::new() +//! .with_title(L10n::n("Menu")) +//! .with_button_color(ButtonColor::Background(Color::Secondary)) +//! .with_auto_close(dropdown::AutoClose::ClickableInside) +//! .with_direction(dropdown::Direction::Dropend) +//! .with_item(dropdown::Item::link(L10n::n("Home"), |_| "/".into())) +//! .with_item(dropdown::Item::link_blank(L10n::n("External"), |_| "https://docs.rs".into())) +//! .with_item(dropdown::Item::divider()) +//! .with_item(dropdown::Item::header(L10n::n("User session"))) +//! .with_item(dropdown::Item::button(L10n::n("Sign out"))); +//! ``` mod props; pub use props::{AutoClose, Direction, MenuAlign, MenuPosition}; diff --git a/extensions/pagetop-bootsier/src/theme/dropdown/component.rs b/extensions/pagetop-bootsier/src/theme/dropdown/component.rs index b70fed65..833cf40b 100644 --- a/extensions/pagetop-bootsier/src/theme/dropdown/component.rs +++ b/extensions/pagetop-bootsier/src/theme/dropdown/component.rs @@ -1,14 +1,14 @@ use pagetop::prelude::*; +use crate::prelude::*; use crate::LOCALES_BOOTSIER; -use crate::theme::*; -/// Componente para crear un **menú desplegable** ([`dropdown`]). +/// Componente para crear un **menú desplegable**. /// /// Renderiza un botón (único o desdoblado, ver [`with_button_split()`](Self::with_button_split)) -/// para mostrar un menú desplegable de elementos [`dropdown::Item`], que se muestra u oculta según -/// la interacción del usuario. Admite variaciones para el tamaño y el color del botón, también para -/// la dirección de apertura, alineación o política de cierre. +/// para mostrar un menú desplegable de elementos [`dropdown::Item`], que se muestra/oculta según la +/// interacción del usuario. Admite variaciones de tamaño/color del botón, también dirección de +/// apertura, alineación o política de cierre. /// /// Si no tiene título (ver [`with_title()`](Self::with_title)) se muestra únicamente la lista de /// elementos sin ningún botón para interactuar. @@ -17,25 +17,8 @@ use crate::theme::*; /// cuenta **el título** (si no existe le asigna uno por defecto) y **la lista de elementos**; el /// resto de propiedades no afectarán a su representación en [`Nav`]. /// +/// Ver ejemplo en el módulo [`dropdown`]. /// Si no contiene elementos, el componente **no se renderiza**. -/// -/// # Ejemplo -/// -/// ```rust -/// use pagetop::prelude::*; -/// use pagetop_bootsier::theme::*; -/// -/// let dd = Dropdown::new() -/// .with_title(L10n::n("Menu")) -/// .with_button_color(ButtonColor::Background(Color::Secondary)) -/// .with_auto_close(dropdown::AutoClose::ClickableInside) -/// .with_direction(dropdown::Direction::Dropend) -/// .with_item(dropdown::Item::link(L10n::n("Home"), |_| "/".into())) -/// .with_item(dropdown::Item::link_blank(L10n::n("External"), |_| "https://docs.rs".into())) -/// .with_item(dropdown::Item::divider()) -/// .with_item(dropdown::Item::header(L10n::n("User session"))) -/// .with_item(dropdown::Item::button(L10n::n("Sign out"))); -/// ``` #[derive(AutoDefault, Clone, Debug, Getters)] pub struct Dropdown { #[getters(skip)] diff --git a/extensions/pagetop-bootsier/src/theme/dropdown/props.rs b/extensions/pagetop-bootsier/src/theme/dropdown/props.rs index fb11783d..fd315508 100644 --- a/extensions/pagetop-bootsier/src/theme/dropdown/props.rs +++ b/extensions/pagetop-bootsier/src/theme/dropdown/props.rs @@ -1,6 +1,6 @@ use pagetop::prelude::*; -use crate::theme::*; +use crate::prelude::*; // **< AutoClose >********************************************************************************** diff --git a/extensions/pagetop-bootsier/src/theme/form.rs b/extensions/pagetop-bootsier/src/theme/form.rs index 82c603ef..634dc48a 100644 --- a/extensions/pagetop-bootsier/src/theme/form.rs +++ b/extensions/pagetop-bootsier/src/theme/form.rs @@ -1,4 +1,36 @@ //! Definiciones para crear formularios ([`Form`]). +//! +//! # Ejemplo +//! +//! ```rust +//! use pagetop::prelude::*; +//! use pagetop_bootsier::prelude::*; +//! +//! let form_login = Form::new() +//! .with_id("login") +//! .with_action("/login") +//! .with_child( +//! form::input::Field::email() +//! .with_name("email") +//! .with_label(L10n::n("Email")) +//! .with_required(true), +//! ) +//! .with_child( +//! form::input::Field::password() +//! .with_name("password") +//! .with_label(L10n::n("Password")) +//! .with_required(true), +//! ) +//! .with_child( +//! form::Checkbox::check() +//! .with_name("remember") +//! .with_label(L10n::n("Remember me")), +//! ) +//! .with_child( +//! Button::submit(L10n::n("Sign in")) +//! .with_color(ButtonColor::Background(Color::Primary)), +//! ); +//! ``` mod props; pub use props::{Autocomplete, AutofillField, CheckboxKind, Method}; diff --git a/extensions/pagetop-bootsier/src/theme/form/check.rs b/extensions/pagetop-bootsier/src/theme/form/check.rs index 434b7e6c..824ed92a 100644 --- a/extensions/pagetop-bootsier/src/theme/form/check.rs +++ b/extensions/pagetop-bootsier/src/theme/form/check.rs @@ -17,7 +17,7 @@ use pagetop::prelude::*; /// /// ```rust /// # use pagetop::prelude::*; -/// # use pagetop_bootsier::theme::*; +/// # use pagetop_bootsier::prelude::*; /// let item = form::check::Item::new("apple", L10n::n("Apple")).with_checked(true); /// ``` #[derive(AutoDefault, Clone, Debug, Getters)] @@ -82,7 +82,7 @@ impl Item { /// /// ```rust /// # use pagetop::prelude::*; -/// # use pagetop_bootsier::theme::*; +/// # use pagetop_bootsier::prelude::*; /// let interests = form::check::Field::new() /// .with_name("interests") /// .with_label(L10n::n("Areas of interest")) diff --git a/extensions/pagetop-bootsier/src/theme/form/checkbox.rs b/extensions/pagetop-bootsier/src/theme/form/checkbox.rs index 18ab908f..6206d983 100644 --- a/extensions/pagetop-bootsier/src/theme/form/checkbox.rs +++ b/extensions/pagetop-bootsier/src/theme/form/checkbox.rs @@ -1,7 +1,7 @@ use pagetop::prelude::*; -use crate::LOCALES_BOOTSIER; use crate::theme::form; +use crate::LOCALES_BOOTSIER; /// Componente para crear una **casilla de verificación** o un **interruptor** (*toggle switch*). /// @@ -17,7 +17,7 @@ use crate::theme::form; /// /// ```rust /// # use pagetop::prelude::*; -/// # use pagetop_bootsier::theme::*; +/// # use pagetop_bootsier::prelude::*; /// let accept_terms = form::Checkbox::check() // También sirve new() o default(). /// .with_name("terms_accepted") /// .with_label(L10n::n("I accept the terms and conditions")) diff --git a/extensions/pagetop-bootsier/src/theme/form/component.rs b/extensions/pagetop-bootsier/src/theme/form/component.rs index 80efa941..e4c22a56 100644 --- a/extensions/pagetop-bootsier/src/theme/form/component.rs +++ b/extensions/pagetop-bootsier/src/theme/form/component.rs @@ -2,9 +2,9 @@ use pagetop::prelude::*; use crate::theme::form; -/// Componente para crear un **formulario** ([`form`]). +/// Componente para crear un **formulario**. /// -/// Este componente renderiza un formulario estándar con soporte para los atributos más habituales: +/// Este componente renderiza un `
` estándar con soporte para los atributos más habituales: /// /// - `id`: identificador opcional del formulario. /// - `classes`: clases CSS adicionales (p. ej. utilidades CSS). @@ -17,33 +17,13 @@ use crate::theme::form; /// # Ejemplo /// /// ```rust -/// use pagetop::prelude::*; -/// use pagetop_bootsier::theme::*; -/// -/// let form_login = Form::new() -/// .with_id("login") -/// .with_action("/login") -/// .with_child( -/// form::input::Field::email() -/// .with_name("email") -/// .with_label(L10n::n("Email")) -/// .with_required(true), -/// ) -/// .with_child( -/// form::input::Field::password() -/// .with_name("password") -/// .with_label(L10n::n("Password")) -/// .with_required(true), -/// ) -/// .with_child( -/// form::Checkbox::check() -/// .with_name("remember") -/// .with_label(L10n::n("Remember me")), -/// ) -/// .with_child( -/// Button::submit(L10n::n("Sign in")) -/// .with_color(ButtonColor::Background(Color::Primary)), -/// ); +/// # use pagetop::prelude::*; +/// # use pagetop_bootsier::prelude::*; +/// let search = Form::new() +/// .with_id("search") +/// .with_action("/search") +/// .with_method(form::Method::Get) +/// .with_child(form::input::Field::search().with_name("q")); /// ``` #[derive(AutoDefault, Clone, Debug, Getters)] pub struct Form { diff --git a/extensions/pagetop-bootsier/src/theme/form/fieldset.rs b/extensions/pagetop-bootsier/src/theme/form/fieldset.rs index 1aacba6c..b5d0e822 100644 --- a/extensions/pagetop-bootsier/src/theme/form/fieldset.rs +++ b/extensions/pagetop-bootsier/src/theme/form/fieldset.rs @@ -15,7 +15,7 @@ use pagetop::prelude::*; /// /// ```rust /// # use pagetop::prelude::*; -/// # use pagetop_bootsier::theme::*; +/// # use pagetop_bootsier::prelude::*; /// let personal_data = form::Fieldset::new() /// .with_legend(L10n::n("Personal data")) /// .with_description(L10n::n("Enter your full name and contact email.")) diff --git a/extensions/pagetop-bootsier/src/theme/form/hidden.rs b/extensions/pagetop-bootsier/src/theme/form/hidden.rs index 6d367155..61d24547 100644 --- a/extensions/pagetop-bootsier/src/theme/form/hidden.rs +++ b/extensions/pagetop-bootsier/src/theme/form/hidden.rs @@ -12,7 +12,7 @@ use pagetop::prelude::*; /// /// ```rust /// # use pagetop::prelude::*; -/// # use pagetop_bootsier::theme::*; +/// # use pagetop_bootsier::prelude::*; /// let token = form::Hidden::new() /// .with_name("csrf_token") /// .with_value("a1b2c3d4e5"); diff --git a/extensions/pagetop-bootsier/src/theme/form/input.rs b/extensions/pagetop-bootsier/src/theme/form/input.rs index 68cce931..a6dc34ea 100644 --- a/extensions/pagetop-bootsier/src/theme/form/input.rs +++ b/extensions/pagetop-bootsier/src/theme/form/input.rs @@ -2,8 +2,8 @@ use pagetop::prelude::*; -use crate::LOCALES_BOOTSIER; use crate::theme::form; +use crate::LOCALES_BOOTSIER; use std::fmt; @@ -106,7 +106,7 @@ impl fmt::Display for Mode { /// /// ```rust /// # use pagetop::prelude::*; -/// # use pagetop_bootsier::theme::*; +/// # use pagetop_bootsier::prelude::*; /// let email = form::input::Field::email() /// .with_name("email") /// .with_label(L10n::n("Email address")) diff --git a/extensions/pagetop-bootsier/src/theme/form/props.rs b/extensions/pagetop-bootsier/src/theme/form/props.rs index 2ef88f3e..dbd1e705 100644 --- a/extensions/pagetop-bootsier/src/theme/form/props.rs +++ b/extensions/pagetop-bootsier/src/theme/form/props.rs @@ -52,7 +52,7 @@ pub enum CheckboxKind { /// /// ```rust /// # use pagetop::prelude::*; -/// # use pagetop_bootsier::theme::*; +/// # use pagetop_bootsier::prelude::*; /// // Correo electrónico con sugerencia semántica del navegador. /// let ac = form::Autocomplete::email(); /// @@ -244,7 +244,7 @@ impl fmt::Display for Autocomplete { /// # Ejemplo /// /// ```rust -/// # use pagetop_bootsier::theme::*; +/// # use pagetop_bootsier::prelude::*; /// let ac = form::Autocomplete::token(form::AutofillField::Username); /// let ac = form::Autocomplete::shipping(form::AutofillField::StreetAddress); /// let ac = form::Autocomplete::section("job", form::AutofillField::Email); diff --git a/extensions/pagetop-bootsier/src/theme/form/radio.rs b/extensions/pagetop-bootsier/src/theme/form/radio.rs index d79c4f44..2514c4bf 100644 --- a/extensions/pagetop-bootsier/src/theme/form/radio.rs +++ b/extensions/pagetop-bootsier/src/theme/form/radio.rs @@ -16,7 +16,7 @@ use crate::LOCALES_BOOTSIER; /// /// ```rust /// # use pagetop::prelude::*; -/// # use pagetop_bootsier::theme::*; +/// # use pagetop_bootsier::prelude::*; /// let item = form::radio::Item::new("monthly", L10n::n("Monthly")).with_checked(true); /// ``` #[derive(AutoDefault, Clone, Debug, Getters)] @@ -76,7 +76,7 @@ impl Item { /// /// ```rust /// # use pagetop::prelude::*; -/// # use pagetop_bootsier::theme::*; +/// # use pagetop_bootsier::prelude::*; /// let plan = form::radio::Field::new() /// .with_name("plan") /// .with_label(L10n::n("Subscription plan")) diff --git a/extensions/pagetop-bootsier/src/theme/form/range.rs b/extensions/pagetop-bootsier/src/theme/form/range.rs index 45d07acf..40350479 100644 --- a/extensions/pagetop-bootsier/src/theme/form/range.rs +++ b/extensions/pagetop-bootsier/src/theme/form/range.rs @@ -10,7 +10,7 @@ use pagetop::prelude::*; /// /// ```rust /// # use pagetop::prelude::*; -/// # use pagetop_bootsier::theme::*; +/// # use pagetop_bootsier::prelude::*; /// let volume = form::Range::new() /// .with_name("volume") /// .with_label(L10n::n("Volume")) diff --git a/extensions/pagetop-bootsier/src/theme/form/select.rs b/extensions/pagetop-bootsier/src/theme/form/select.rs index 7d51e9c9..1fa74f09 100644 --- a/extensions/pagetop-bootsier/src/theme/form/select.rs +++ b/extensions/pagetop-bootsier/src/theme/form/select.rs @@ -2,8 +2,8 @@ use pagetop::prelude::*; -use crate::LOCALES_BOOTSIER; use crate::theme::form; +use crate::LOCALES_BOOTSIER; // **< Item >*************************************************************************************** @@ -20,7 +20,7 @@ use crate::theme::form; /// /// ```rust /// # use pagetop::prelude::*; -/// # use pagetop_bootsier::theme::*; +/// # use pagetop_bootsier::prelude::*; /// let item = form::select::Item::new("es", L10n::n("Spanish")).with_selected(true); /// ``` #[derive(AutoDefault, Clone, Debug, Getters)] @@ -76,7 +76,7 @@ impl Item { /// /// ```rust /// # use pagetop::prelude::*; -/// # use pagetop_bootsier::theme::*; +/// # use pagetop_bootsier::prelude::*; /// let group = form::select::Group::new(L10n::n("Europe")) /// .with_item(form::select::Item::new("es", L10n::n("Spanish"))) /// .with_item(form::select::Item::new("fr", L10n::n("French"))); @@ -149,7 +149,7 @@ pub enum Entry { /// /// ```rust /// # use pagetop::prelude::*; -/// # use pagetop_bootsier::theme::*; +/// # use pagetop_bootsier::prelude::*; /// let idioma = form::select::Field::new() /// .with_name("language") /// .with_label(L10n::n("Language")) diff --git a/extensions/pagetop-bootsier/src/theme/form/textarea.rs b/extensions/pagetop-bootsier/src/theme/form/textarea.rs index 81b32783..c545df8c 100644 --- a/extensions/pagetop-bootsier/src/theme/form/textarea.rs +++ b/extensions/pagetop-bootsier/src/theme/form/textarea.rs @@ -1,7 +1,7 @@ use pagetop::prelude::*; -use crate::LOCALES_BOOTSIER; use crate::theme::form; +use crate::LOCALES_BOOTSIER; /// Componente para crear un **área de texto** de formulario. /// @@ -13,7 +13,7 @@ use crate::theme::form; /// /// ```rust /// # use pagetop::prelude::*; -/// # use pagetop_bootsier::theme::*; +/// # use pagetop_bootsier::prelude::*; /// let descripcion = form::Textarea::new() /// .with_name("description") /// .with_label(L10n::n("Description")) diff --git a/extensions/pagetop-bootsier/src/theme/icon.rs b/extensions/pagetop-bootsier/src/theme/icon.rs index 9ef6aeee..935aa847 100644 --- a/extensions/pagetop-bootsier/src/theme/icon.rs +++ b/extensions/pagetop-bootsier/src/theme/icon.rs @@ -1,4 +1,4 @@ -use crate::theme::*; +use crate::prelude::*; const DEFAULT_VIEWBOX: &str = "0 0 16 16"; diff --git a/extensions/pagetop-bootsier/src/theme/image/component.rs b/extensions/pagetop-bootsier/src/theme/image/component.rs index df2c28a7..898fb573 100644 --- a/extensions/pagetop-bootsier/src/theme/image/component.rs +++ b/extensions/pagetop-bootsier/src/theme/image/component.rs @@ -1,16 +1,14 @@ use pagetop::prelude::*; -use crate::theme::*; +use crate::prelude::*; -/// Componente para renderizar una **imagen** ([`image`]). +/// Componente para renderizar una **imagen**. /// -/// A una imagen se le puede: -/// -/// - Establecer su contenido a partir del origen definido en [`image::Source`]. -/// - Configurar sus **dimensiones** ([`with_size()`](Self::with_size)), **borde** +/// - Ajusta su disposición según el origen definido en [`image::Source`]. +/// - Permite configurar **dimensiones** ([`with_size()`](Self::with_size)), **borde** /// ([`classes::Border`](crate::theme::classes::Border)) y **redondeo de esquinas** /// ([`classes::Rounded`](crate::theme::classes::Rounded)). -/// - Aplicar el texto alternativo `alt` con **localización** mediante [`L10n`]. +/// - Resuelve el texto alternativo `alt` con **localización** mediante [`L10n`]. #[derive(AutoDefault, Clone, Debug, Getters)] pub struct Image { #[getters(skip)] @@ -55,7 +53,7 @@ impl Component for Image { { (logo.render(cx)) } - }); + }) } image::Source::Responsive(source) => Some(source), image::Source::Thumbnail(source) => Some(source), diff --git a/extensions/pagetop-bootsier/src/theme/nav.rs b/extensions/pagetop-bootsier/src/theme/nav.rs index 74e9214d..16b3d2d7 100644 --- a/extensions/pagetop-bootsier/src/theme/nav.rs +++ b/extensions/pagetop-bootsier/src/theme/nav.rs @@ -1,4 +1,4 @@ -//! Definiciones para crear menús ([`Nav`]). +//! Definiciones para crear menús [`Nav`] o alguna de sus variantes de presentación. //! //! Cada [`nav::Item`](crate::theme::nav::Item) representa un elemento individual del menú [`Nav`], //! con distintos comportamientos según su finalidad, como enlaces de navegación o menús @@ -6,6 +6,26 @@ //! //! Los ítems pueden estar activos, deshabilitados o abrirse en nueva ventana según su contexto y //! configuración, y permiten incluir etiquetas localizables usando [`L10n`](pagetop::locale::L10n). +//! +//! # Ejemplo +//! +//! ```rust +//! # use pagetop::prelude::*; +//! # use pagetop_bootsier::prelude::*; +//! let nav = Nav::tabs() +//! .with_layout(nav::Layout::End) +//! .with_item(nav::Item::link(L10n::n("Home"), |_| "/".into())) +//! .with_item(nav::Item::link_blank(L10n::n("External"), |_| "https://docs.rs".into())) +//! .with_item(nav::Item::dropdown( +//! Dropdown::new() +//! .with_title(L10n::n("Options")) +//! .with_item(ChildOp::AddMany(vec![ +//! dropdown::Item::link(L10n::n("Action"), |_| "/action".into()).into(), +//! dropdown::Item::link(L10n::n("Another"), |_| "/another".into()).into(), +//! ])), +//! )) +//! .with_item(nav::Item::link_disabled(L10n::n("Disabled"), |_| "#".into())); +//! ``` mod props; pub use props::{Kind, Layout}; diff --git a/extensions/pagetop-bootsier/src/theme/nav/component.rs b/extensions/pagetop-bootsier/src/theme/nav/component.rs index aeb0447e..0b7797c8 100644 --- a/extensions/pagetop-bootsier/src/theme/nav/component.rs +++ b/extensions/pagetop-bootsier/src/theme/nav/component.rs @@ -1,35 +1,15 @@ use pagetop::prelude::*; -use crate::theme::*; +use crate::prelude::*; -/// Componente para crear un **menú** ([`nav`]). +/// Componente para crear un **menú** o alguna de sus variantes ([`nav::Kind`]). /// /// Presenta un menú con una lista de elementos usando una vista básica, o alguna de sus variantes -/// ([`nav::Kind`]) como *pestañas* (`Tabs`), *botones* (`Pills`) o *subrayado* (`Underline`). -/// También permite controlar su distribución y orientación ([`nav::Layout`](crate::theme::nav::Layout)). +/// como *pestañas* (`Tabs`), *botones* (`Pills`) o *subrayado* (`Underline`). También permite +/// controlar su distribución y orientación ([`nav::Layout`](crate::theme::nav::Layout)). /// +/// Ver ejemplo en el módulo [`nav`]. /// Si no contiene elementos, el componente **no se renderiza**. -/// -/// # Ejemplo -/// -/// ```rust -/// use pagetop::prelude::*; -/// use pagetop_bootsier::theme::*; -/// -/// let nav = Nav::tabs() -/// .with_layout(nav::Layout::End) -/// .with_item(nav::Item::link(L10n::n("Home"), |_| "/".into())) -/// .with_item(nav::Item::link_blank(L10n::n("External"), |_| "https://docs.rs".into())) -/// .with_item(nav::Item::dropdown( -/// Dropdown::new() -/// .with_title(L10n::n("Options")) -/// .with_item(ChildOp::AddMany(vec![ -/// dropdown::Item::link(L10n::n("Action"), |_| "/action".into()).into(), -/// dropdown::Item::link(L10n::n("Another"), |_| "/another".into()).into(), -/// ])), -/// )) -/// .with_item(nav::Item::link_disabled(L10n::n("Disabled"), |_| "#".into())); -/// ``` #[derive(AutoDefault, Clone, Debug, Getters)] pub struct Nav { #[getters(skip)] diff --git a/extensions/pagetop-bootsier/src/theme/nav/item.rs b/extensions/pagetop-bootsier/src/theme/nav/item.rs index 43386baf..956ccdcd 100644 --- a/extensions/pagetop-bootsier/src/theme/nav/item.rs +++ b/extensions/pagetop-bootsier/src/theme/nav/item.rs @@ -1,7 +1,7 @@ use pagetop::prelude::*; +use crate::prelude::*; use crate::LOCALES_BOOTSIER; -use crate::theme::*; // **< ItemKind >*********************************************************************************** diff --git a/extensions/pagetop-bootsier/src/theme/navbar.rs b/extensions/pagetop-bootsier/src/theme/navbar.rs index f381b1f3..31a16ccc 100644 --- a/extensions/pagetop-bootsier/src/theme/navbar.rs +++ b/extensions/pagetop-bootsier/src/theme/navbar.rs @@ -1,4 +1,4 @@ -//! Definiciones para crear barras de navegación ([`Navbar`]). +//! Definiciones para crear barras de navegación [`Navbar`]. //! //! Cada [`navbar::Item`](crate::theme::navbar::Item) representa un elemento individual de la barra //! de navegación [`Navbar`], con distintos comportamientos según su finalidad, como menús @@ -6,6 +6,126 @@ //! //! También puede mostrar una marca de identidad ([`navbar::Brand`](crate::theme::navbar::Brand)) //! que identifique la compañía, producto o nombre del proyecto asociado a la solución web. +//! +//! # Ejemplos +//! +//! Barra **simple**, sólo con un menú horizontal: +//! +//! ```rust +//! # use pagetop::prelude::*; +//! # use pagetop_bootsier::prelude::*; +//! let navbar = Navbar::simple() +//! .with_item(navbar::Item::nav( +//! Nav::new() +//! .with_item(nav::Item::link(L10n::n("Home"), |_| "/".into())) +//! .with_item(nav::Item::link(L10n::n("About"), |_| "/about".into())) +//! .with_item(nav::Item::link(L10n::n("Contact"), |_| "/contact".into())) +//! )); +//! ``` +//! +//! Barra **colapsable**, con botón de despliegue y contenido en el desplegable cuando colapsa: +//! +//! ```rust +//! # use pagetop::prelude::*; +//! # use pagetop_bootsier::prelude::*; +//! let navbar = Navbar::simple_toggle() +//! .with_expand(BreakPoint::MD) +//! .with_item(navbar::Item::nav( +//! Nav::new() +//! .with_item(nav::Item::link(L10n::n("Home"), |_| "/".into())) +//! .with_item(nav::Item::link_blank(L10n::n("Docs"), |_| "https://docs.rs".into())) +//! .with_item(nav::Item::link(L10n::n("Support"), |_| "/support".into())) +//! )); +//! ``` +//! +//! Barra con **marca de identidad a la izquierda** y menú a la derecha, típica de una cabecera: +//! +//! ```rust +//! # use pagetop::prelude::*; +//! # use pagetop_bootsier::prelude::*; +//! let brand = navbar::Brand::new() +//! .with_title(L10n::n("PageTop")) +//! .with_route(Some(|cx| cx.route("/"))); +//! +//! let navbar = Navbar::brand_left(brand) +//! .with_item(navbar::Item::nav( +//! Nav::new() +//! .with_item(nav::Item::link(L10n::n("Home"), |_| "/".into())) +//! .with_item(nav::Item::dropdown( +//! Dropdown::new() +//! .with_title(L10n::n("Tools")) +//! .with_item(dropdown::Item::link( +//! L10n::n("Generator"), |_| "/tools/gen".into()) +//! ) +//! .with_item(dropdown::Item::link( +//! L10n::n("Reports"), |_| "/tools/reports".into()) +//! ) +//! )) +//! .with_item(nav::Item::link_disabled(L10n::n("Disabled"), |_| "#".into())) +//! )); +//! ``` +//! +//! Barra con **botón de despliegue a la izquierda** y **marca de identidad a la derecha**: +//! +//! ```rust +//! # use pagetop::prelude::*; +//! # use pagetop_bootsier::prelude::*; +//! let brand = navbar::Brand::new() +//! .with_title(L10n::n("Intranet")) +//! .with_route(Some(|cx| cx.route("/"))); +//! +//! let navbar = Navbar::brand_right(brand) +//! .with_expand(BreakPoint::LG) +//! .with_item(navbar::Item::nav( +//! Nav::pills() +//! .with_item(nav::Item::link(L10n::n("Dashboard"), |_| "/dashboard".into())) +//! .with_item(nav::Item::link(L10n::n("Users"), |_| "/users".into())) +//! )); +//! ``` +//! +//! Barra con el **contenido en un *offcanvas***, ideal para dispositivos móviles o menús largos: +//! +//! ```rust +//! # use pagetop::prelude::*; +//! # use pagetop_bootsier::prelude::*; +//! let oc = Offcanvas::new() +//! .with_id("main_offcanvas") +//! .with_title(L10n::n("Main menu")) +//! .with_placement(offcanvas::Placement::Start) +//! .with_backdrop(offcanvas::Backdrop::Enabled); +//! +//! let navbar = Navbar::offcanvas(oc) +//! .with_item(navbar::Item::nav( +//! Nav::new() +//! .with_item(nav::Item::link(L10n::n("Home"), |_| "/".into())) +//! .with_item(nav::Item::link(L10n::n("Profile"), |_| "/profile".into())) +//! .with_item(nav::Item::dropdown( +//! Dropdown::new() +//! .with_title(L10n::n("More")) +//! .with_item(dropdown::Item::link(L10n::n("Settings"), |_| "/settings".into())) +//! .with_item(dropdown::Item::link(L10n::n("Help"), |_| "/help".into())) +//! )) +//! )); +//! ``` +//! +//! Barra **fija arriba**: +//! +//! ```rust +//! # use pagetop::prelude::*; +//! # use pagetop_bootsier::prelude::*; +//! let brand = navbar::Brand::new() +//! .with_title(L10n::n("Main App")) +//! .with_route(Some(|cx| cx.route("/"))); +//! +//! let navbar = Navbar::brand_left(brand) +//! .with_position(navbar::Position::FixedTop) +//! .with_item(navbar::Item::nav( +//! Nav::new() +//! .with_item(nav::Item::link(L10n::n("Dashboard"), |_| "/".into())) +//! .with_item(nav::Item::link(L10n::n("Donors"), |_| "/donors".into())) +//! .with_item(nav::Item::link(L10n::n("Stock"), |_| "/stock".into())) +//! )); +//! ``` mod props; pub use props::{Layout, Position}; diff --git a/extensions/pagetop-bootsier/src/theme/navbar/brand.rs b/extensions/pagetop-bootsier/src/theme/navbar/brand.rs index 9e5082b6..4d575e03 100644 --- a/extensions/pagetop-bootsier/src/theme/navbar/brand.rs +++ b/extensions/pagetop-bootsier/src/theme/navbar/brand.rs @@ -1,6 +1,6 @@ use pagetop::prelude::*; -use crate::theme::*; +use crate::prelude::*; /// Marca de identidad para mostrar en una barra de navegación [`Navbar`]. /// diff --git a/extensions/pagetop-bootsier/src/theme/navbar/component.rs b/extensions/pagetop-bootsier/src/theme/navbar/component.rs index 096ec87a..33aa80de 100644 --- a/extensions/pagetop-bootsier/src/theme/navbar/component.rs +++ b/extensions/pagetop-bootsier/src/theme/navbar/component.rs @@ -1,139 +1,19 @@ use pagetop::prelude::*; +use crate::prelude::*; use crate::LOCALES_BOOTSIER; -use crate::theme::*; const TOGGLE_COLLAPSE: &str = "collapse"; const TOGGLE_OFFCANVAS: &str = "offcanvas"; -/// Componente para crear una **barra de navegación** ([`navbar`]). +/// Componente para crear una **barra de navegación**. /// /// Permite mostrar enlaces, menús y una marca de identidad en distintas disposiciones (simples, con /// botón de despliegue o dentro de un [`offcanvas`]), controladas por [`navbar::Layout`]. También /// puede fijarse en la parte superior o inferior del documento mediante [`navbar::Position`]. /// +/// Ver ejemplos en el módulo [`navbar`]. /// Si no contiene elementos, el componente **no se renderiza**. -/// -/// # Ejemplos -/// -/// Barra **simple**, sólo con un menú horizontal: -/// -/// ```rust -/// use pagetop::prelude::*; -/// use pagetop_bootsier::theme::*; -/// -/// let navbar = Navbar::simple() -/// .with_item(navbar::Item::nav( -/// Nav::new() -/// .with_item(nav::Item::link(L10n::n("Home"), |_| "/".into())) -/// .with_item(nav::Item::link(L10n::n("About"), |_| "/about".into())) -/// .with_item(nav::Item::link(L10n::n("Contact"), |_| "/contact".into())) -/// )); -/// ``` -/// -/// Barra **colapsable**, con botón de despliegue y contenido en el desplegable cuando colapsa: -/// -/// ```rust -/// # use pagetop::prelude::*; -/// # use pagetop_bootsier::theme::*; -/// let navbar = Navbar::simple_toggle() -/// .with_expand(BreakPoint::MD) -/// .with_item(navbar::Item::nav( -/// Nav::new() -/// .with_item(nav::Item::link(L10n::n("Home"), |_| "/".into())) -/// .with_item(nav::Item::link_blank(L10n::n("Docs"), |_| "https://docs.rs".into())) -/// .with_item(nav::Item::link(L10n::n("Support"), |_| "/support".into())) -/// )); -/// ``` -/// -/// Barra con **marca de identidad a la izquierda** y menú a la derecha, típica de una cabecera: -/// -/// ```rust -/// # use pagetop::prelude::*; -/// # use pagetop_bootsier::theme::*; -/// let brand = navbar::Brand::new() -/// .with_title(L10n::n("PageTop")) -/// .with_route(Some(|cx| cx.route("/"))); -/// -/// let navbar = Navbar::brand_left(brand) -/// .with_item(navbar::Item::nav( -/// Nav::new() -/// .with_item(nav::Item::link(L10n::n("Home"), |_| "/".into())) -/// .with_item(nav::Item::dropdown( -/// Dropdown::new() -/// .with_title(L10n::n("Tools")) -/// .with_item(dropdown::Item::link( -/// L10n::n("Generator"), |_| "/tools/gen".into()) -/// ) -/// .with_item(dropdown::Item::link( -/// L10n::n("Reports"), |_| "/tools/reports".into()) -/// ) -/// )) -/// .with_item(nav::Item::link_disabled(L10n::n("Disabled"), |_| "#".into())) -/// )); -/// ``` -/// -/// Barra con **botón de despliegue a la izquierda** y **marca de identidad a la derecha**: -/// -/// ```rust -/// # use pagetop::prelude::*; -/// # use pagetop_bootsier::theme::*; -/// let brand = navbar::Brand::new() -/// .with_title(L10n::n("Intranet")) -/// .with_route(Some(|cx| cx.route("/"))); -/// -/// let navbar = Navbar::brand_right(brand) -/// .with_expand(BreakPoint::LG) -/// .with_item(navbar::Item::nav( -/// Nav::pills() -/// .with_item(nav::Item::link(L10n::n("Dashboard"), |_| "/dashboard".into())) -/// .with_item(nav::Item::link(L10n::n("Users"), |_| "/users".into())) -/// )); -/// ``` -/// -/// Barra con el **contenido en un *offcanvas***, ideal para dispositivos móviles o menús largos: -/// -/// ```rust -/// # use pagetop::prelude::*; -/// # use pagetop_bootsier::theme::*; -/// let oc = Offcanvas::new() -/// .with_id("main_offcanvas") -/// .with_title(L10n::n("Main menu")) -/// .with_placement(offcanvas::Placement::Start) -/// .with_backdrop(offcanvas::Backdrop::Enabled); -/// -/// let navbar = Navbar::offcanvas(oc) -/// .with_item(navbar::Item::nav( -/// Nav::new() -/// .with_item(nav::Item::link(L10n::n("Home"), |_| "/".into())) -/// .with_item(nav::Item::link(L10n::n("Profile"), |_| "/profile".into())) -/// .with_item(nav::Item::dropdown( -/// Dropdown::new() -/// .with_title(L10n::n("More")) -/// .with_item(dropdown::Item::link(L10n::n("Settings"), |_| "/settings".into())) -/// .with_item(dropdown::Item::link(L10n::n("Help"), |_| "/help".into())) -/// )) -/// )); -/// ``` -/// -/// Barra **fija arriba**: -/// -/// ```rust -/// # use pagetop::prelude::*; -/// # use pagetop_bootsier::theme::*; -/// let brand = navbar::Brand::new() -/// .with_title(L10n::n("Main App")) -/// .with_route(Some(|cx| cx.route("/"))); -/// -/// let navbar = Navbar::brand_left(brand) -/// .with_position(navbar::Position::FixedTop) -/// .with_item(navbar::Item::nav( -/// Nav::new() -/// .with_item(nav::Item::link(L10n::n("Dashboard"), |_| "/".into())) -/// .with_item(nav::Item::link(L10n::n("Donors"), |_| "/donors".into())) -/// .with_item(nav::Item::link(L10n::n("Stock"), |_| "/stock".into())) -/// )); -/// ``` #[derive(AutoDefault, Clone, Debug, Getters)] pub struct Navbar { #[getters(skip)] diff --git a/extensions/pagetop-bootsier/src/theme/navbar/item.rs b/extensions/pagetop-bootsier/src/theme/navbar/item.rs index 9b48adf1..caba4e7d 100644 --- a/extensions/pagetop-bootsier/src/theme/navbar/item.rs +++ b/extensions/pagetop-bootsier/src/theme/navbar/item.rs @@ -1,6 +1,6 @@ use pagetop::prelude::*; -use crate::theme::*; +use crate::prelude::*; /// Elementos que puede contener una barra de navegación [`Navbar`](crate::theme::Navbar). /// diff --git a/extensions/pagetop-bootsier/src/theme/navbar/props.rs b/extensions/pagetop-bootsier/src/theme/navbar/props.rs index e0d64916..1ac248b7 100644 --- a/extensions/pagetop-bootsier/src/theme/navbar/props.rs +++ b/extensions/pagetop-bootsier/src/theme/navbar/props.rs @@ -1,6 +1,6 @@ use pagetop::prelude::*; -use crate::theme::*; +use crate::prelude::*; // **< Layout >************************************************************************************* diff --git a/extensions/pagetop-bootsier/src/theme/offcanvas.rs b/extensions/pagetop-bootsier/src/theme/offcanvas.rs index 63ecbc66..166893aa 100644 --- a/extensions/pagetop-bootsier/src/theme/offcanvas.rs +++ b/extensions/pagetop-bootsier/src/theme/offcanvas.rs @@ -1,4 +1,24 @@ -//! Definiciones para crear paneles laterales deslizantes ([`Offcanvas`]). +//! Definiciones para crear paneles laterales deslizantes [`Offcanvas`]. +//! +//! # Ejemplo +//! +//! ```rust +//! # use pagetop::prelude::*; +//! # use pagetop_bootsier::prelude::*; +//! let panel = Offcanvas::new() +//! .with_id("offcanvas_example") +//! .with_title(L10n::n("Offcanvas title")) +//! .with_placement(offcanvas::Placement::End) +//! .with_backdrop(offcanvas::Backdrop::Enabled) +//! .with_body_scroll(offcanvas::BodyScroll::Enabled) +//! .with_visibility(offcanvas::Visibility::Default) +//! .with_child(Dropdown::new() +//! .with_title(L10n::n("Menu")) +//! .with_item(dropdown::Item::label(L10n::n("Label"))) +//! .with_item(dropdown::Item::link_blank(L10n::n("Docs"), |_| "https://docs.rs".into())) +//! .with_item(dropdown::Item::link(L10n::n("Sign out"), |_| "/signout".into())) +//! ); +//! ``` mod props; pub use props::{Backdrop, BodyScroll, Placement, Visibility}; diff --git a/extensions/pagetop-bootsier/src/theme/offcanvas/component.rs b/extensions/pagetop-bootsier/src/theme/offcanvas/component.rs index a2c014b8..88aad443 100644 --- a/extensions/pagetop-bootsier/src/theme/offcanvas/component.rs +++ b/extensions/pagetop-bootsier/src/theme/offcanvas/component.rs @@ -1,9 +1,9 @@ use pagetop::prelude::*; +use crate::prelude::*; use crate::LOCALES_BOOTSIER; -use crate::theme::*; -/// Componente para crear un **panel lateral deslizante** ([`offcanvas`]). +/// Componente para crear un **panel lateral deslizante** con contenidos adicionales. /// /// Útil para navegación, filtros, formularios o menús contextuales. Incluye las siguientes /// características principales: @@ -19,28 +19,8 @@ use crate::theme::*; /// - Asocia título y controles de accesibilidad a un identificador único y expone atributos /// adecuados para lectores de pantalla y navegación por teclado. /// +/// Ver ejemplo en el módulo [`offcanvas`]. /// Si no contiene elementos, el componente **no se renderiza**. -/// -/// # Ejemplo -/// -/// ```rust -/// use pagetop::prelude::*; -/// use pagetop_bootsier::theme::*; -/// -/// let panel = Offcanvas::new() -/// .with_id("offcanvas_example") -/// .with_title(L10n::n("Offcanvas title")) -/// .with_placement(offcanvas::Placement::End) -/// .with_backdrop(offcanvas::Backdrop::Enabled) -/// .with_body_scroll(offcanvas::BodyScroll::Enabled) -/// .with_visibility(offcanvas::Visibility::Default) -/// .with_child(Dropdown::new() -/// .with_title(L10n::n("Menu")) -/// .with_item(dropdown::Item::label(L10n::n("Label"))) -/// .with_item(dropdown::Item::link_blank(L10n::n("Docs"), |_| "https://docs.rs".into())) -/// .with_item(dropdown::Item::link(L10n::n("Sign out"), |_| "/signout".into())) -/// ); -/// ``` #[derive(AutoDefault, Clone, Debug, Getters)] pub struct Offcanvas { #[getters(skip)] diff --git a/extensions/pagetop-seaorm/Cargo.toml b/extensions/pagetop-seaorm/Cargo.toml deleted file mode 100644 index 6e2b6fc7..00000000 --- a/extensions/pagetop-seaorm/Cargo.toml +++ /dev/null @@ -1,29 +0,0 @@ -[package] -name = "pagetop-seaorm" -version = "0.0.4" - -description = """ - Proporciona a PageTop acceso basado en SeaORM a bases de datos relacionales. -""" -categories = ["database", "development-tools", "asynchronous"] -keywords = ["pagetop", "database", "sql", "orm", "ssr"] - -repository.workspace = true -homepage.workspace = true -edition.workspace = true -license.workspace = true -authors.workspace = true - -[features] -mysql = ["sea-orm/sqlx-mysql"] -postgres = ["sea-orm/sqlx-postgres"] -sqlite = ["sea-orm/sqlx-sqlite"] - -[dependencies] -async-trait.workspace = true -pagetop.workspace = true -sea-orm.workspace = true -sea-schema.workspace = true -serde.workspace = true -tokio.workspace = true -url.workspace = true diff --git a/extensions/pagetop-seaorm/LICENSE-APACHE b/extensions/pagetop-seaorm/LICENSE-APACHE deleted file mode 100644 index 263ddac1..00000000 --- a/extensions/pagetop-seaorm/LICENSE-APACHE +++ /dev/null @@ -1,201 +0,0 @@ - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright 2022 Manuel Cillero - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. \ No newline at end of file diff --git a/extensions/pagetop-seaorm/LICENSE-MIT b/extensions/pagetop-seaorm/LICENSE-MIT deleted file mode 100644 index cd8af3d6..00000000 --- a/extensions/pagetop-seaorm/LICENSE-MIT +++ /dev/null @@ -1,21 +0,0 @@ -MIT License - -Copyright (c) 2022 Manuel Cillero - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. \ No newline at end of file diff --git a/extensions/pagetop-seaorm/README.md b/extensions/pagetop-seaorm/README.md deleted file mode 100644 index 23a4ce40..00000000 --- a/extensions/pagetop-seaorm/README.md +++ /dev/null @@ -1,201 +0,0 @@ -
- -

PageTop SeaORM

- -

Proporciona a PageTop acceso basado en SeaORM a bases de datos relacionales.

- -[![Doc API](https://img.shields.io/docsrs/pagetop-seaorm?label=Doc%20API&style=for-the-badge&logo=Docs.rs)](https://docs.rs/pagetop-seaorm) -[![Crates.io](https://img.shields.io/crates/v/pagetop-seaorm.svg?style=for-the-badge&logo=ipfs)](https://crates.io/crates/pagetop-seaorm) -[![Descargas](https://img.shields.io/crates/d/pagetop-seaorm.svg?label=Descargas&style=for-the-badge&logo=transmission)](https://crates.io/crates/pagetop-seaorm) -[![Licencia](https://img.shields.io/badge/license-MIT%2FApache-blue.svg?label=Licencia&style=for-the-badge)](https://git.cillero.es/manuelcillero/pagetop/src/branch/main/extensions/pagetop-seaorm#licencia) - -
- -## 🧭 Sobre PageTop - -[PageTop](https://docs.rs/pagetop) es un entorno de desarrollo que reivindica la esencia de la web -clásica para crear soluciones web SSR (*renderizadas en el servidor*) modulares, extensibles y -configurables, basadas en HTML, CSS y JavaScript. - - -## ⚡️ Guía rápida - -**Añade la dependencia** a tu `Cargo.toml` activando el motor de base de datos que necesites: - -```toml -[dependencies] -pagetop-seaorm = { version = "...", features = ["sqlite"] } -``` - -Las *features* disponibles son `mysql`, `postgres` y `sqlite`. - -**Configura la conexión** en el archivo de configuración de la aplicación: - -```toml -[database] -db_type = "sqlite" -db_name = "my_app.db" -max_pool_size = 5 -``` - -Para MySQL o PostgreSQL añade también `db_user`, `db_pass` y `db_host`. El campo `db_port` es -opcional; si se omite se usa el puerto predeterminado del motor. - -**Declara la extensión** en tu aplicación o en la extensión que la requiera: - -```rust,ignore -use pagetop::prelude::*; -use pagetop_seaorm::install_migrations; - -mod migration; - -struct MyApp; - -impl Extension for MyApp { - fn dependencies(&self) -> Vec { - vec![ - &pagetop_seaorm::SeaORM, - ] - } - - fn initialize(&self) { - install_migrations!(m20240101_000001_create_users_table); - } -} - -#[pagetop::main] -async fn main() -> std::io::Result<()> { - Application::prepare(&MyApp).run()?.await -} -``` - -**Escribe las migraciones** usando la API de [`migration`]: - -```rust,no_run -// src/migration/m20240101_000001_create_users.rs -use pagetop_seaorm::migration::*; - -pub struct Migration; - -#[async_trait::async_trait] -impl MigrationTrait for Migration { - async fn up(&self, manager: &SchemaManager) -> Result<(), DbErr> { - manager - .create_table( - table_auto(Users::Table) - .col(pk_auto(Users::Id)) - .col(string_uniq(Users::Email)) - .col(string(Users::Name)) - .to_owned(), - ) - .await - } -} - -#[derive(DeriveIden)] -enum Users { - Table, - Id, - Email, - Name, -} -``` - -**Define las entidades** en un módulo `entity/` usando las macros de derivación de [`db`]: - -```rust,no_run -// src/entity/user.rs -use pagetop_seaorm::db::*; - -#[derive(Clone, Debug, DeriveEntityModel, PartialEq)] -#[sea_orm(table_name = "users")] -pub struct Model { - #[sea_orm(primary_key)] - pub id: i32, - pub email: String, - pub name: String, -} - -#[derive(Clone, Copy, Debug, DeriveRelation, EnumIter)] -pub enum Relation {} - -impl ActiveModelBehavior for ActiveModel {} -``` - -**Opera con la base de datos** pasando la conexión [`db::dbconn()`] a cada consulta: - -```rust,ignore -use pagetop_seaorm::db::*; - -// Asumiendo que existe un módulo `user` con la entidad definida arriba. -async fn example() -> Result<(), DbErr> { - // Listar todos los registros: - let users = user::Entity::find().all(dbconn()).await?; - - // Buscar por clave primaria: - let found = user::Entity::find_by_id(1).one(dbconn()).await?; - - // Insertar un registro: - let new_user = user::ActiveModel { - email: Set("alice@example.com".to_owned()), - name: Set("Alice".to_owned()), - ..Default::default() - }; - user::Entity::insert(new_user).exec(dbconn()).await?; - Ok(()) -} -``` - - -## 📚 Créditos - -Este *crate* se apoya en bibliotecas del ecosistema [SeaQL](https://github.com/SeaQL) como: - -* [SeaORM](https://www.sea-ql.org/SeaORM), ORM asíncrono que usa internamente - [SQLx](https://github.com/launchbadge/sqlx) para el acceso y la ejecución de consultas a la base - de datos. - -* [SeaQuery](https://github.com/SeaQL/sea-query), generador de consultas SQL sobre el que se - construye el motor de migraciones y los *helpers* de esquema. - -* [sea-schema](https://github.com/SeaQL/sea-schema), librería de introspección de esquemas SQL, - usada por el módulo de migraciones para interrogar la estructura real de la base de datos (tablas, - columnas, índices y claves externas). - -El módulo de migraciones (`src/migration/`) incorpora una adaptación de -[sea-orm-migration](https://crates.io/crates/sea-orm-migration). El código que se integra procede de -la versión [**1.1.20**](https://github.com/SeaQL/sea-orm/tree/1.1.20/sea-orm-migration) en lugar de -usarlo como dependencia ya que su paradigma de CLI no es compatible con el ciclo de vida de las -extensiones de PageTop, donde las migraciones deben ejecutarse durante la inicialización de cada -extensión. Los ficheros adaptados del original son: - -| Archivos | Observaciones | -|-----------------------|--------------------------------------------------------------------------| -| `lib.rs` | Incluido en `migration.rs`, descarta módulos y exportaciones del CLI | -| `connection.rs` | Integración completa | -| `manager.rs` | Adapta *features* propias | -| `migrator.rs` | Adapta *features* propias y omite gestión de errores del CLI | -| `prelude.rs` | Absorbido en `migration.rs`, descarta exportaciones del CLI | -| `schema.rs` | Integra con ajustes, adaptado de [loco](https://github.com/loco-rs/loco) | -| `seaql_migrations.rs` | Integración completa | - - -## 🚧 Advertencia - -**PageTop** es un proyecto personal para aprender [Rust](https://www.rust-lang.org/es) y conocer su -ecosistema. Su API está sujeta a cambios frecuentes. No se recomienda su uso en producción, al menos -hasta que se libere la versión **1.0.0**. - - -## 📜 Licencia - -El código está disponible bajo una doble licencia: - - * **Licencia MIT** - ([LICENSE-MIT](LICENSE-MIT) o también https://opensource.org/licenses/MIT) - - * **Licencia Apache, Versión 2.0** - ([LICENSE-APACHE](LICENSE-APACHE) o también https://www.apache.org/licenses/LICENSE-2.0) - -Puedes elegir la licencia que prefieras. Este enfoque de doble licencia es el estándar de facto en -el ecosistema Rust. diff --git a/extensions/pagetop-seaorm/src/config.rs b/extensions/pagetop-seaorm/src/config.rs deleted file mode 100644 index e8b119fa..00000000 --- a/extensions/pagetop-seaorm/src/config.rs +++ /dev/null @@ -1,85 +0,0 @@ -//! Opciones de configuración de la extensión. -//! -//! Ejemplo: -//! -//! ```toml -//! [database] -//! db_type = "postgres" -//! db_name = "db" -//! db_user = "user" -//! db_pass = "password" -//! db_host = "localhost" -//! db_port = 5432 -//! max_pool_size = 5 -//! ``` -//! -//! Uso: -//! -//! ```rust -//! # use pagetop_seaorm::config; -//! assert_eq!(config::SETTINGS.database.db_host, "localhost"); -//! ``` -//! -//! Consulta [`pagetop::config`] para ver cómo PageTop lee los archivos de configuración y aplica -//! los valores a los ajustes. - -use pagetop::prelude::*; - -use serde::Deserialize; - -include_config!(SETTINGS: Settings => [ - // [database] - "database.db_type" => "", - "database.db_name" => "", - "database.db_user" => "", - "database.db_pass" => "", - "database.db_host" => "localhost", - "database.max_pool_size" => 5, -]); - -/// Ajustes para la sección [`Database`] de [`SETTINGS`]. -#[derive(Debug, Deserialize)] -pub struct Settings { - pub database: Database, -} - -/// Sección **`[database]`** de la configuración. Forma parte de [`Settings`]. -#[derive(Debug, Deserialize)] -pub struct Database { - /// Motor de base de datos. - /// - /// Valores aceptados: `"mysql"` (también `"mariadb"`), `"postgres"` (también `"postgresql"`) y - /// `"sqlite"`. Si se omite, la aplicación terminará con un error al arrancar. - pub db_type: DbType, - /// Nombre (para mysql/postgres) o referencia (para sqlite) de la base de datos. - pub db_name: String, - /// Usuario de conexión a la base de datos (para mysql/postgres). - pub db_user: String, - /// Contraseña para la conexión a la base de datos (para mysql/postgres). - pub db_pass: String, - /// Servidor de conexión a la base de datos (para mysql/postgres). - pub db_host: String, - /// Puerto de conexión a la base de datos (para mysql/postgres). Si se omite, se usa el puerto - /// predeterminado para el motor: 3306 para MySQL y 5432 para PostgreSQL. - pub db_port: Option, - /// Número máximo de conexiones habilitadas. - pub max_pool_size: u32, -} - -/// Motor de base de datos. Usado en el campo [`Database::db_type`] de [`SETTINGS`]. -#[derive(Clone, Copy, Debug, Deserialize)] -#[serde(rename_all = "lowercase")] -pub enum DbType { - /// Valor por defecto cuando `db_type` no está configurado. En este caso la aplicación terminará - /// con un error al arrancar. - #[serde(rename = "")] - Unset, - /// Usa el motor MySQL. Acepta también el alias `"mariadb"`. - #[serde(alias = "mariadb")] - Mysql, - /// Usa el motor PostgreSQL. Acepta también el alias `"postgresql"`. - #[serde(alias = "postgresql")] - Postgres, - /// Usa el motor SQLite. - Sqlite, -} diff --git a/extensions/pagetop-seaorm/src/db.rs b/extensions/pagetop-seaorm/src/db.rs deleted file mode 100644 index a2b5dd4d..00000000 --- a/extensions/pagetop-seaorm/src/db.rs +++ /dev/null @@ -1,308 +0,0 @@ -//! Definición de entidades y acceso a la base de datos. -//! -//! Agrupa los *traits*, macros y tipos del sistema de entidades de SeaORM, junto con las funciones -//! [`dbconn`], [`execute`], [`fetch_all`] y [`fetch_one`], en una sola importación: -//! -//! ```rust -//! use pagetop_seaorm::db::*; -//! ``` -//! -//! El sistema de entidades (`Entity::find()`, `Entity::insert()`, transacciones) es el camino -//! recomendado para la mayoría de operaciones. Las funciones [`execute`], [`fetch_all`] y -//! [`fetch_one`] ofrecen vías alternativas para cuando ese sistema no es suficiente, como consultas -//! sin entidad concreta, SQL específico para el motor de base de datos utilizado o sentencias -//! puntuales. -//! -//! Estas funciones integran los valores como literales escapados, no como parámetros de base de -//! datos. Para consultas con datos del usuario, el sistema de entidades es más robusto. Si aun así -//! se necesita SQL en crudo con parámetros reales, se puede construir un [`api::Statement`] -//! directamente con [`api::Statement::from_sql_and_values`]. -//! -//! ## Tipos esenciales -//! -//! Destacan los siguientes elementos de uso más frecuente: -//! -//! - **Acceso**: [`DatabaseConnection`], [`dbconn`] (para obtener el pool de conexiones). -//! - **Consultas**: [`EntityTrait`], [`QueryFilter`], [`QueryOrder`], [`QuerySelect`]. -//! - **Transacciones**: [`TransactionTrait`], [`DatabaseTransaction`]. -//! - **Modelos activos**: [`ActiveModelTrait`], [`ActiveValue`] ([`ActiveValue::Set`], -//! [`ActiveValue::Unchanged`], [`ActiveValue::NotSet`]). -//! - **Macros de derivación**: [`DeriveEntityModel`], [`DeriveColumn`], [`DerivePrimaryKey`], -//! [`DeriveRelation`], [`EnumIter`]. -//! - **Errores**: [`DbErr`]. -//! - **Resultados**: [`QueryResult`] (filas sin tipar), [`ExecResult`] (INSERT/UPDATE/DELETE). -//! -//! ## Definir una entidad -//! -//! ```rust -//! use pagetop_seaorm::db::*; -//! -//! #[derive(Clone, Debug, PartialEq, DeriveEntityModel)] -//! #[sea_orm(table_name = "users")] -//! // El struct debe llamarse `Model`: es un requisito de `DeriveEntityModel`. -//! pub struct Model { -//! #[sea_orm(primary_key)] -//! pub id: i32, -//! pub email: String, -//! pub name: String, -//! } -//! -//! #[derive(Clone, Copy, Debug, EnumIter, DeriveRelation)] -//! pub enum Relation {} -//! -//! // `DeriveEntityModel` genera también `ActiveModel`, `Entity`, `Column` y `PrimaryKey`. -//! impl ActiveModelBehavior for ActiveModel {} -//! ``` -//! -//! ## Operaciones CRUD -//! -//! ```rust,ignore -//! use pagetop_seaorm::db::*; -//! -//! // El código asume que existe un módulo `user` con una entidad SeaORM definida. -//! -//! async fn example() -> Result<(), DbErr> { -//! // Buscar todos los registros. -//! let users = user::Entity::find().all(dbconn()).await?; -//! -//! // Buscar con filtro. -//! let alices = user::Entity::find() -//! .filter(user::Column::Name.eq("Alice")) -//! .all(dbconn()) -//! .await?; -//! -//! // Buscar por clave primaria. -//! let found = user::Entity::find_by_id(1).one(dbconn()).await?; -//! -//! // Insertar. -//! let model = user::ActiveModel { -//! name: ActiveValue::Set("Alice".into()), -//! ..Default::default() -//! }; -//! user::Entity::insert(model).exec(dbconn()).await?; -//! -//! // Actualizar: campos con `ActiveValue::Set`, clave primaria con `ActiveValue::Unchanged`. -//! let patch = user::ActiveModel { -//! id: ActiveValue::Unchanged(1), -//! name: ActiveValue::Set("Bob".into()), -//! ..Default::default() -//! }; -//! patch.update(dbconn()).await?; -//! -//! // Eliminar por clave primaria. -//! user::Entity::delete_by_id(1).exec(dbconn()).await?; -//! -//! // Transacción. `Box::pin` es necesario: `TransactionTrait` exige `Pin>`. -//! dbconn().transaction::<_, DbErr, _>(|txn| Box::pin(async move { -//! user::Entity::insert( -//! user::ActiveModel { name: ActiveValue::Set("Carol".into()), ..Default::default() } -//! ).exec(txn).await?; -//! user::Entity::delete_by_id(2).exec(txn).await?; -//! Ok(()) -//! })).await?; -//! Ok(()) -//! } -//! ``` -//! -//! Para migraciones y definición de esquemas usa [`migration`](crate::migration). -//! -//! ## Acceso completo a SeaORM -//! -//! El módulo [`api`] re-exporta el crate `sea_orm` íntegro bajo ese alias. Úsalo cuando necesites -//! un tipo o función que no esté expuesto directamente en `db::*`: -//! -//! ```rust -//! use pagetop_seaorm::db::api; -//! -//! // Tipos o utilidades no incluidos en db::*: -//! let _: api::DatabaseBackend = api::DatabaseBackend::Sqlite; -//! ``` -//! -//! ## Construcción de consultas en tiempo de ejecución -//! -//! El módulo [`query`] re-exporta `sea_query` para construir las sentencias SQL que se pasan a -//! [`fetch_all`] y [`fetch_one`]. Es el compañero natural de esas funciones dentro del módulo `db`: -//! -//! ```rust -//! use pagetop_seaorm::db::*; -//! use pagetop_seaorm::db::query::*; -//! -//! async fn example() -> Result<(), DbErr> { -//! let stmt = Query::select() -//! .column(Asterisk) -//! .from(Alias::new("users")) -//! .to_owned(); -//! let rows = fetch_all(&stmt).await?; -//! Ok(()) -//! } -//! ``` - -pub use sea_orm::prelude::*; - -pub use sea_orm::{ - ActiveValue, DatabaseTransaction, ExecResult, QueryOrder, QuerySelect, TransactionTrait, -}; - -/// Permite implementar *traits* con métodos `async`: -#[doc(inline)] -pub use async_trait; - -/// Re-exporta el crate `sea_orm` íntegro como puerta de acceso a su API completa. -/// -/// Útil para tipos o utilidades que no están expuestos directamente en [`db::*`](self). La inmensa -/// mayoría de operaciones no necesitan este módulo; `db::*` cubre los casos habituales. -#[doc(inline)] -pub use sea_orm as api; - -/// Re-exporta `sea_query` para construir sentencias SQL en tiempo de ejecución. -/// -/// Proporciona los constructores de consultas (`Query`, `Expr`, `Alias`, ...) que se pasan a -/// [`fetch_all`] y [`fetch_one`]. Aunque [`migration`](crate::migration) expone las mismas -/// herramientas en el contexto de la definición de esquemas, `query` las sitúa donde corresponde -/// cuando se trata del acceso a la base de datos en tiempo de ejecución. -#[doc(inline)] -pub use sea_orm::sea_query as query; - -/// Devuelve una referencia estática al pool de conexiones. -/// -/// El pool se inicializa una sola vez al arrancar la aplicación; las llamadas posteriores devuelven -/// la misma referencia sin coste apreciable. Se puede invocar tantas veces como sea necesario sin -/// penalización. -/// -/// ```rust,no_run -/// use pagetop_seaorm::db::*; -/// -/// let _conn: &DatabaseConnection = dbconn(); -/// ``` -#[inline] -pub fn dbconn() -> &'static DatabaseConnection { - &super::DBCONN -} - -/// Ejecuta una sentencia SQL en crudo y devuelve su resultado. -/// -/// No construye la sentencia (INSERT, UPDATE, DELETE), sino que la recibe como una cadena ya -/// formada. Útil para SQL que el sistema de entidades no cubre. El [`ExecResult`] devuelto expone -/// [`rows_affected`](ExecResult::rows_affected) y [`last_insert_id`](ExecResult::last_insert_id) -/// (fiable en MySQL y SQLite; en PostgreSQL devuelve `0`, usa `RETURNING` con el sistema de -/// entidades si necesitas el id insertado). -/// -/// > **Nota:** no sirve para SELECT porque no devuelve filas. Para leer datos usa [`fetch_all`] o -/// > [`fetch_one`]. -/// -/// > **Advertencia:** nunca interpoles valores externos en la cadena SQL directamente. Para -/// > sentencias con parámetros de usuario usa el sistema de entidades. -/// -/// ```rust -/// use pagetop_seaorm::db::*; -/// -/// async fn example() -> Result<(), DbErr> { -/// let result = execute("DELETE FROM sessions WHERE expired = 1").await?; -/// println!("Filas eliminadas: {}", result.rows_affected()); -/// Ok(()) -/// } -/// ``` -pub async fn execute(stmt: impl Into) -> Result { - let conn = dbconn(); - let backend = conn.get_database_backend(); - conn.execute(api::Statement::from_string(backend, stmt.into())) - .await -} - -/// Ejecuta una consulta para devolver todas las filas resultantes. -/// -/// Acepta cualquier tipo que implemente [`query::QueryStatementWriter`] (p. ej. -/// [`query::SelectStatement`]) y serializa la sentencia para el motor de base de datos usado antes -/// de ejecutarla. Cada fila se devuelve como un [`QueryResult`] sin tipar; extrae los valores con -/// [`QueryResult::try_get`]. -/// -/// Usa esta función cuando la consulta SELECT no mapea una entidad concreta (JOINs, agregaciones, -/// proyecciones parciales) o cuando necesitas control total sobre el SQL generado. Para sentencias -/// que modifican datos (INSERT, UPDATE, DELETE), usa [`execute`]. Para consultas que sí mapean a -/// una entidad, es preferible `Entity::find().all(dbconn())`. -/// -/// Los valores se integran como literales escapados, no como parámetros de base de datos. Para -/// datos procedentes del usuario, el sistema de entidades es más robusto. -/// -/// ```rust -/// use pagetop_seaorm::db::*; -/// use pagetop_seaorm::db::query::*; -/// -/// async fn example() -> Result<(), DbErr> { -/// let stmt = Query::select() -/// .column(Asterisk) -/// .from(Alias::new("users")) -/// .to_owned(); -/// let rows = fetch_all(&stmt).await?; -/// for row in rows { -/// let name: String = row.try_get("", "name")?; -/// println!("{name}"); -/// } -/// Ok(()) -/// } -/// ``` -pub async fn fetch_all( - stmt: &Q, -) -> Result, DbErr> { - let conn = dbconn(); - let backend = conn.get_database_backend(); - conn.query_all(api::Statement::from_string( - backend, - match backend { - api::DatabaseBackend::MySql => stmt.to_string(query::MysqlQueryBuilder), - api::DatabaseBackend::Postgres => stmt.to_string(query::PostgresQueryBuilder), - api::DatabaseBackend::Sqlite => stmt.to_string(query::SqliteQueryBuilder), - }, - )) - .await -} - -/// Ejecuta una consulta y devuelve sólo la primera fila, si existe. -/// -/// Funciona igual que [`fetch_all`] pero devuelve la primera fila si existe, o `None` si la -/// consulta no produce resultados. Está diseñada para sentencias SELECT; para modificar datos sin -/// entidad mapeada, usa [`execute`]. -/// -/// Si la consulta puede devolver varias filas, se recomienda incluir `LIMIT 1` en la sentencia -/// para que el motor detenga la búsqueda en cuanto encuentre la primera fila y no recupere -/// resultados que se descartarán de todas formas. -/// -/// Usa esta función cuando la consulta SELECT no mapea una entidad concreta (JOINs, agregaciones, -/// proyecciones parciales) o cuando necesitas control total sobre el SQL generado. Para consultas -/// que sí mapean a una entidad, es preferible `Entity::find().one(dbconn())`. -/// -/// Los valores se integran como literales escapados, no como parámetros de base de datos. Para -/// datos procedentes del usuario, el sistema de entidades es más robusto. -/// -/// ```rust -/// use pagetop_seaorm::db::*; -/// use pagetop_seaorm::db::query::*; -/// -/// async fn example() -> Result<(), DbErr> { -/// let stmt = Query::select() -/// .column(Asterisk) -/// .from(Alias::new("users")) -/// .and_where(Expr::col(Alias::new("id")).eq(1)) -/// .to_owned(); -/// if let Some(row) = fetch_one(&stmt).await? { -/// let name: String = row.try_get("", "name")?; -/// println!("{name}"); -/// } -/// Ok(()) -/// } -/// ``` -pub async fn fetch_one( - stmt: &Q, -) -> Result, DbErr> { - let conn = dbconn(); - let backend = conn.get_database_backend(); - conn.query_one(api::Statement::from_string( - backend, - match backend { - api::DatabaseBackend::MySql => stmt.to_string(query::MysqlQueryBuilder), - api::DatabaseBackend::Postgres => stmt.to_string(query::PostgresQueryBuilder), - api::DatabaseBackend::Sqlite => stmt.to_string(query::SqliteQueryBuilder), - }, - )) - .await -} diff --git a/extensions/pagetop-seaorm/src/lib.rs b/extensions/pagetop-seaorm/src/lib.rs deleted file mode 100644 index ef056f64..00000000 --- a/extensions/pagetop-seaorm/src/lib.rs +++ /dev/null @@ -1,249 +0,0 @@ -/*! -
- -

PageTop SeaORM

- -

Proporciona a PageTop acceso basado en SeaORM a bases de datos relacionales.

- -[![Doc API](https://img.shields.io/docsrs/pagetop-seaorm?label=Doc%20API&style=for-the-badge&logo=Docs.rs)](https://docs.rs/pagetop-seaorm) -[![Crates.io](https://img.shields.io/crates/v/pagetop-seaorm.svg?style=for-the-badge&logo=ipfs)](https://crates.io/crates/pagetop-seaorm) -[![Descargas](https://img.shields.io/crates/d/pagetop-seaorm.svg?label=Descargas&style=for-the-badge&logo=transmission)](https://crates.io/crates/pagetop-seaorm) -[![Licencia](https://img.shields.io/badge/license-MIT%2FApache-blue.svg?label=Licencia&style=for-the-badge)](https://git.cillero.es/manuelcillero/pagetop/src/branch/main/extensions/pagetop-seaorm#licencia) - -
- -## 🧭 Sobre PageTop - -[PageTop](https://docs.rs/pagetop) es un entorno de desarrollo que reivindica la esencia de la web -clásica para crear soluciones web SSR (*renderizadas en el servidor*) modulares, extensibles y -configurables, basadas en HTML, CSS y JavaScript. - - -## ⚡️ Guía rápida - -**Añade la dependencia** a tu `Cargo.toml` activando el motor de base de datos que necesites: - -```toml -[dependencies] -pagetop-seaorm = { version = "...", features = ["sqlite"] } -``` - -Las *features* disponibles son `mysql`, `postgres` y `sqlite`. - -**Configura la conexión** en el archivo de configuración de la aplicación: - -```toml -[database] -db_type = "sqlite" -db_name = "my_app.db" -max_pool_size = 5 -``` - -Para MySQL o PostgreSQL añade también `db_user`, `db_pass` y `db_host`. El campo `db_port` es -opcional; si se omite se usa el puerto predeterminado del motor. - -**Declara la extensión** en tu aplicación o en la extensión que la requiera: - -```rust,ignore -use pagetop::prelude::*; -use pagetop_seaorm::install_migrations; - -mod migration; - -struct MyApp; - -impl Extension for MyApp { - fn dependencies(&self) -> Vec { - vec![ - &pagetop_seaorm::SeaORM, - ] - } - - fn initialize(&self) { - install_migrations!(m20240101_000001_create_users); - } -} - -#[pagetop::main] -async fn main() -> std::io::Result<()> { - Application::prepare(&MyApp).run()?.await -} -``` - -**Escribe las migraciones** usando la API de [`migration`]: - -```rust,no_run -// src/migration/m20240101_000001_create_users.rs -use pagetop_seaorm::migration::*; - -pub struct Migration; - -#[async_trait::async_trait] -impl MigrationTrait for Migration { - async fn up(&self, manager: &SchemaManager) -> Result<(), DbErr> { - manager - .create_table( - table_auto(Users::Table) - .col(pk_auto(Users::Id)) - .col(string_uniq(Users::Email)) - .col(string(Users::Name)) - .to_owned(), - ) - .await - } -} - -#[derive(DeriveIden)] -enum Users { - Table, - Id, - Email, - Name, -} -``` - -**Define las entidades** en un módulo `entity/` usando las macros de derivación de [`db`]: - -```rust,no_run -// src/entity/user.rs -use pagetop_seaorm::db::*; - -#[derive(Clone, Debug, DeriveEntityModel, PartialEq)] -#[sea_orm(table_name = "users")] -pub struct Model { - #[sea_orm(primary_key)] - pub id: i32, - pub email: String, - pub name: String, -} - -#[derive(Clone, Copy, Debug, DeriveRelation, EnumIter)] -pub enum Relation {} - -impl ActiveModelBehavior for ActiveModel {} -``` - -**Opera con la base de datos** pasando la conexión [`db::dbconn()`] a cada consulta: - -```rust,ignore -use pagetop_seaorm::db::*; - -// Asumiendo que existe un módulo `user` con la entidad definida arriba. -async fn example() -> Result<(), DbErr> { - // Listar todos los registros: - let users = user::Entity::find().all(dbconn()).await?; - - // Buscar por clave primaria: - let found = user::Entity::find_by_id(1).one(dbconn()).await?; - - // Insertar un registro: - let new_user = user::ActiveModel { - email: Set("alice@example.com".to_owned()), - name: Set("Alice".to_owned()), - ..Default::default() - }; - user::Entity::insert(new_user).exec(dbconn()).await?; - Ok(()) -} -``` -*/ - -#![doc( - html_favicon_url = "https://git.cillero.es/manuelcillero/pagetop/raw/branch/main/static/favicon.ico" -)] - -use pagetop::prelude::*; - -use sea_orm::{ConnectOptions, Database, DatabaseConnection}; -use url::Url; - -use std::sync::LazyLock; - -include_locales!(LOCALES_SEAORM); - -pub mod config; - -pub mod db; - -pub mod migration; - -// Ejecuta un *future* de forma síncrona dentro del runtime de Tokio. -// -// Usa [`tokio::task::block_in_place`] para ceder el hilo actual al código bloqueante sin detener el -// *pool* de trabajo de Tokio, y a continuación ejecuta el *future* con el *handle* del *runtime* -// activo. Requiere el *runtime* multi-hilo (predeterminado con `#[pagetop::main]`). -// -// En tests, `#[pagetop::test]` aplica `multi_thread` por defecto. Si se utiliza `#[tokio::test]` -// directamente, habría que añadir `(flavor = "multi_thread")` si el test invoca código que llame a -// esta función. -pub(crate) fn run_now(future: F) -> F::Output { - tokio::task::block_in_place(|| tokio::runtime::Handle::current().block_on(future)) -} - -pub(crate) static DBCONN: LazyLock = LazyLock::new(|| { - trace::info!( - "Connecting to database \"{}\" using a pool of {} connections", - &config::SETTINGS.database.db_name, - &config::SETTINGS.database.max_pool_size - ); - - let db_uri: String = match config::SETTINGS.database.db_type { - config::DbType::Unset => panic!( - "database.db_type is not configured: set it to \"mysql\", \"postgres\" or \"sqlite\"" - ), - config::DbType::Mysql | config::DbType::Postgres => { - let scheme = if matches!(config::SETTINGS.database.db_type, config::DbType::Mysql) { - "mysql" - } else { - "postgres" - }; - let mut tmp_uri = Url::parse(&format!( - "{}://{}/{}", - scheme, - &config::SETTINGS.database.db_host, - &config::SETTINGS.database.db_name - )) - .expect("Invalid database URL: check db_host and db_name in config"); - tmp_uri - .set_username(config::SETTINGS.database.db_user.as_str()) - .expect("Failed to set db_user in connection URL"); - // https://github.com/launchbadge/sqlx/issues/1624 - tmp_uri - .set_password(Some(config::SETTINGS.database.db_pass.as_str())) - .expect("Failed to set db_pass in connection URL"); - if let Some(port) = config::SETTINGS.database.db_port { - tmp_uri - .set_port(Some(port)) - .expect("Failed to set db_port in connection URL"); - } - tmp_uri.to_string() - } - config::DbType::Sqlite => { - format!("sqlite://{}", &config::SETTINGS.database.db_name) - } - }; - - run_now(Database::connect::({ - let mut db_opt = ConnectOptions::new(db_uri); - db_opt.max_connections(config::SETTINGS.database.max_pool_size); - db_opt - })) - .expect("Failed to connect to database") -}); - -/// Implementa la extensión. -pub struct SeaORM; - -impl Extension for SeaORM { - fn name(&self) -> L10n { - L10n::t("extension_name", &LOCALES_SEAORM) - } - - fn description(&self) -> L10n { - L10n::t("extension_description", &LOCALES_SEAORM) - } - - fn initialize(&self) { - std::sync::LazyLock::force(&DBCONN); - } -} diff --git a/extensions/pagetop-seaorm/src/locale/en-US/extension.ftl b/extensions/pagetop-seaorm/src/locale/en-US/extension.ftl deleted file mode 100644 index f80d7aa4..00000000 --- a/extensions/pagetop-seaorm/src/locale/en-US/extension.ftl +++ /dev/null @@ -1,2 +0,0 @@ -extension_name = SeaORM support -extension_description = Provides SeaORM-based access to relational databases. diff --git a/extensions/pagetop-seaorm/src/locale/es-ES/extension.ftl b/extensions/pagetop-seaorm/src/locale/es-ES/extension.ftl deleted file mode 100644 index e48e4653..00000000 --- a/extensions/pagetop-seaorm/src/locale/es-ES/extension.ftl +++ /dev/null @@ -1,2 +0,0 @@ -extension_name = Soporte a SeaORM -extension_description = Proporciona acceso basado en SeaORM a bases de datos relacionales. diff --git a/extensions/pagetop-seaorm/src/migration.rs b/extensions/pagetop-seaorm/src/migration.rs deleted file mode 100644 index f3544f7f..00000000 --- a/extensions/pagetop-seaorm/src/migration.rs +++ /dev/null @@ -1,298 +0,0 @@ -//! API para definir y ejecutar migraciones de base de datos. -//! -//! Cuando una extensión necesita persistir datos en una base de datos usando `pagetop_seaorm`, -//! define sus migraciones en un submódulo `migration/` y las aplica al arrancar con la macro -//! [`install_migrations!`](crate::install_migrations). -//! -//! Con una sola importación tienes todo lo necesario: -//! -//! ```rust -//! use pagetop_seaorm::migration::*; -//! ``` -//! -//! # Convención de nombrado -//! -//! Cada migración es un módulo con el formato `m__`. El -//! prefijo numérico garantiza el orden cronológico de aplicación: -//! -//! ```text -//! src/ -//! └── migration/ -//! ├── m20240101_000001_create_users.rs -//! └── m20240115_000002_add_email_index.rs -//! ``` -//! -//! # Estructura de una migración -//! -//! Cada archivo define un *struct* `Migration` que implementa [`MigrationTrait`]. El método `up` -//! aplica el cambio; `down` lo revierte. Si no se implementa, devuelve un error; es **obligatorio** -//! implementarlo si la extensión usa [`uninstall_migrations!`](crate::uninstall_migrations): -//! -//! ```rust,no_run -//! // src/migration/m20240101_000001_create_users.rs -//! use pagetop_seaorm::migration::*; -//! -//! pub struct Migration; -//! -//! #[async_trait::async_trait] -//! impl MigrationTrait for Migration { -//! async fn up(&self, manager: &SchemaManager) -> Result<(), DbErr> { -//! manager -//! .create_table( -//! table_auto(Users::Table) -//! .col(pk_auto(Users::Id)) -//! .col(string_uniq(Users::Email)) -//! .col(string(Users::Name)) -//! .to_owned(), -//! ) -//! .await -//! } -//! } -//! -//! #[derive(DeriveIden)] -//! enum Users { -//! Table, -//! Id, -//! Email, -//! Name, -//! } -//! ``` -//! -//! # Seguimiento automático -//! -//! Las migraciones se mantienen en una tabla `seaql_migrations` de la base de datos. Cada migración -//! aplicada queda registrada con su nombre y su marca de tiempo. Las migraciones ya aplicadas se -//! omiten en ejecuciones posteriores. -//! -//! # Operaciones con `SchemaManager` -//! -//! El parámetro `manager` que recibe cada migración expone los métodos necesarios para -//! modificar el esquema. Estos son los más habituales: -//! -//! | Método | Acción | -//! |-----------------------------------------------|---------------------------------| -//! | [`SchemaManager::create_table`] | Crea una tabla | -//! | [`SchemaManager::drop_table`] | Elimina una tabla | -//! | [`SchemaManager::alter_table`] | Modifica una tabla existente | -//! | [`SchemaManager::rename_table`] | Renombra una tabla | -//! | [`SchemaManager::truncate_table`] | Vacía una tabla | -//! | [`SchemaManager::create_index`] | Crea un índice | -//! | [`SchemaManager::drop_index`] | Elimina un índice | -//! | [`SchemaManager::create_foreign_key`] | Crea una clave foránea | -//! | [`SchemaManager::drop_foreign_key`] | Elimina una clave foránea | -//! | [`SchemaManager::has_table`] | Comprueba si existe una tabla | -//! | [`SchemaManager::has_column`] | Comprueba si existe una columna | -//! | [`SchemaManager::has_index`] | Comprueba si existe un índice | -//! | [`SchemaManager::create_type`] *(PostgreSQL)* | Crea un tipo personalizado | -//! | [`SchemaManager::alter_type`] *(PostgreSQL)* | Modifica un tipo personalizado | -//! | [`SchemaManager::drop_type`] *(PostgreSQL)* | Elimina un tipo personalizado | -//! -//! # Funciones de esquema -//! -//! Las funciones de esquema disponibles simplifican la definición de columnas. Siguen el patrón -//! `(col)` (NOT NULL), `_null(col)` (nulable) y `_uniq(col)` (NOT NULL + UNIQUE). -//! Algunos ejemplos: -//! -//! | Función | SQL equivalente | -//! |---------------------|-----------------------------------------------------| -//! | `table_auto(tabla)` | `CREATE TABLE IF NOT EXISTS` + timestamps | -//! | `pk_auto(col)` | `INTEGER NOT NULL PRIMARY KEY` (con autoincremento) | -//! | `pk_uuid(col)` | `UUID NOT NULL PRIMARY KEY` | -//! | `string(col)` | `VARCHAR NOT NULL` | -//! | `string_null(col)` | `VARCHAR NULL` | -//! | `string_uniq(col)` | `VARCHAR NOT NULL UNIQUE` | -//! | `integer(col)` | `INTEGER NOT NULL` | -//! | `boolean(col)` | `BOOLEAN NOT NULL` | -//! | `timestamp(col)` | `TIMESTAMP NOT NULL` | -//! | `uuid(col)` | `UUID NOT NULL` | -//! -//! Estas son sólo las funciones más habituales. El módulo [`schema`] define la lista completa, con -//! variantes para `decimal`, `date`, `time`, `json`, `blob`, `binary`, `array`, `enumeration`, -//! `char`, `interval` y sus formas `_null` y `_uniq`. - -// **< Adaptación de `sea-orm-migration/lib.rs` (ver §Créditos en README.md) >********************** - -//pub mod cli; -pub mod connection; -pub mod manager; -pub mod migrator; -//pub mod prelude; -pub mod schema; -pub mod seaql_migrations; -//pub mod util; - -#[doc(inline)] -pub use connection::*; -#[doc(inline)] -pub use manager::*; -//pub use migrator::*; - -/// Permite implementar *traits* con métodos `async`: -#[doc(inline)] -pub use async_trait; -//pub use sea_orm; -//pub use sea_orm::sea_query; -pub use sea_orm::DbErr; - -pub trait MigrationName { - fn name(&self) -> &str; -} - -/// The migration definition -#[async_trait::async_trait] -pub trait MigrationTrait: MigrationName + Send + Sync { - /// Define actions to perform when applying the migration - async fn up(&self, manager: &SchemaManager) -> Result<(), DbErr>; - - /// Define actions to perform when rolling back the migration - async fn down(&self, _manager: &SchemaManager) -> Result<(), DbErr> { - Err(DbErr::Migration( - "Rollback not implemented for this migration".to_owned(), - )) - } -} - -// ************************************************************************************************* - -#[doc(inline)] -pub use migrator::MigratorTrait; -#[doc(inline)] -pub use schema::*; -pub use sea_orm::DeriveIden; -pub use sea_orm::sea_query::*; - -use pagetop::core::TypeInfo; - -impl MigrationName for M { - fn name(&self) -> &str { - // Extrae el módulo contenedor, descartando el segmento final "Migration". - TypeInfo::NameTo(-2).of::() - } -} - -/// Elemento de migración listo para incluir en la lista de un [`MigratorTrait`]. -pub type MigrationItem = Box; - -/// Interfaz síncrona para ejecutar migraciones desde código no asíncrono. -/// -/// Todo tipo que implemente [`MigratorTrait`] obtiene esta interfaz automáticamente, incluidos los -/// tipos generados por los macros [`install_migrations!`](crate::install_migrations) y -/// [`uninstall_migrations!`](crate::uninstall_migrations). -pub trait MigratorBase { - /// Ejecuta las migraciones pendientes en orden ascendente. - /// - /// Provoca un `panic!` si alguna migración falla, evitando que la aplicación arranque con un - /// esquema de base de datos inconsistente. - fn run_up(); - - /// Revierte todas las migraciones en orden descendente. - /// - /// Provoca un `panic!` si alguna reversión falla. - fn run_down(); -} - -impl MigratorBase for M { - fn run_up() { - let conn = SchemaManagerConnection::Connection(&super::DBCONN); - if let Err(e) = super::run_now(Self::up(conn, None)) { - panic!("Migration upgrade failed: {e}"); - } - } - - fn run_down() { - let conn = SchemaManagerConnection::Connection(&super::DBCONN); - if let Err(e) = super::run_now(Self::down(conn, None)) { - panic!("Migration downgrade failed: {e}"); - } - } -} - -/// Aplica las migraciones pendientes al arrancar una extensión. -/// -/// Recibe uno o más nombres de módulo de migración y ejecuta el método `up` de los que aún no estén -/// registrados en la tabla `seaql_migrations`. Se invoca habitualmente desde -/// [`Extension::initialize`](pagetop::core::extension::Extension::initialize). -/// -/// **Requisito:** cada módulo de migración debe declararse como submódulo público bajo un módulo -/// `migration` accesible desde el punto de llamada, y exportar `pub struct Migration` que -/// implemente [`MigrationTrait`]. El macro genera rutas de la forma -/// `migration::::Migration`. Estructura mínima: -/// -/// En `src/migration.rs`: -/// ```rust,ignore -/// pub mod m20240101_000001_create_users; -/// pub mod m20240115_000002_add_email_index; -/// ``` -/// -/// En `src/lib.rs`: -/// ```rust,ignore -/// mod migration; -/// -/// impl Extension for MyExt { -/// fn initialize(&self) { -/// install_migrations!( -/// m20240101_000001_create_users, -/// m20240115_000002_add_email_index, -/// ); -/// } -/// } -/// ``` -#[macro_export] -macro_rules! install_migrations { - ( $($migration_module:ident),+ $(,)? ) => {{ - use $crate::migration::{MigrationItem, MigratorBase, MigratorTrait}; - - struct Migrator; - impl MigratorTrait for Migrator { - fn migrations() -> Vec { - let mut m = Vec::::new(); - $( - m.push(Box::new(migration::$migration_module::Migration)); - )* - m - } - } - Migrator::run_up(); - }}; -} - -/// Revierte las migraciones de una extensión en orden inverso al de su aplicación. -/// -/// Ejecuta el método `down` de cada migración indicada. Si el método `down` de alguna migración -/// devuelve un error, provoca un `panic!`. Complementario a -/// [`install_migrations!`](crate::install_migrations). -/// -/// **Requisito:** los módulos de migración deben declararse como en -/// [`install_migrations!`](crate::install_migrations). Todos los módulos indicados **deben -/// implementar `down`**; la implementación por defecto devuelve error, lo que provoca un pánico en -/// `run_down`. -/// -/// En `src/lib.rs`: -/// ```rust,ignore -/// impl Extension for MyExt { -/// fn uninitialize(&self) { -/// uninstall_migrations!( -/// m20240101_000001_create_users, -/// m20240115_000002_add_email_index, -/// ); -/// } -/// } -/// ``` -#[macro_export] -macro_rules! uninstall_migrations { - ( $($migration_module:ident),+ $(,)? ) => {{ - use $crate::migration::{MigrationItem, MigratorBase, MigratorTrait}; - - struct Migrator; - impl MigratorTrait for Migrator { - fn migrations() -> Vec { - let mut m = Vec::::new(); - $( - m.push(Box::new(migration::$migration_module::Migration)); - )* - m - } - } - Migrator::run_down(); - }}; -} diff --git a/extensions/pagetop-seaorm/src/migration/connection.rs b/extensions/pagetop-seaorm/src/migration/connection.rs deleted file mode 100644 index a34acc47..00000000 --- a/extensions/pagetop-seaorm/src/migration/connection.rs +++ /dev/null @@ -1,148 +0,0 @@ -use sea_orm::{ - AccessMode, ConnectionTrait, DatabaseConnection, DatabaseTransaction, DbBackend, DbErr, - ExecResult, IsolationLevel, QueryResult, Statement, TransactionError, TransactionTrait, -}; -use std::future::Future; -use std::pin::Pin; - -pub enum SchemaManagerConnection<'c> { - Connection(&'c DatabaseConnection), - Transaction(&'c DatabaseTransaction), -} - -#[async_trait::async_trait] -impl ConnectionTrait for SchemaManagerConnection<'_> { - fn get_database_backend(&self) -> DbBackend { - match self { - SchemaManagerConnection::Connection(conn) => conn.get_database_backend(), - SchemaManagerConnection::Transaction(trans) => trans.get_database_backend(), - } - } - - async fn execute(&self, stmt: Statement) -> Result { - match self { - SchemaManagerConnection::Connection(conn) => conn.execute(stmt).await, - SchemaManagerConnection::Transaction(trans) => trans.execute(stmt).await, - } - } - - async fn execute_unprepared(&self, sql: &str) -> Result { - match self { - SchemaManagerConnection::Connection(conn) => conn.execute_unprepared(sql).await, - SchemaManagerConnection::Transaction(trans) => trans.execute_unprepared(sql).await, - } - } - - async fn query_one(&self, stmt: Statement) -> Result, DbErr> { - match self { - SchemaManagerConnection::Connection(conn) => conn.query_one(stmt).await, - SchemaManagerConnection::Transaction(trans) => trans.query_one(stmt).await, - } - } - - async fn query_all(&self, stmt: Statement) -> Result, DbErr> { - match self { - SchemaManagerConnection::Connection(conn) => conn.query_all(stmt).await, - SchemaManagerConnection::Transaction(trans) => trans.query_all(stmt).await, - } - } - - fn is_mock_connection(&self) -> bool { - match self { - SchemaManagerConnection::Connection(conn) => conn.is_mock_connection(), - SchemaManagerConnection::Transaction(trans) => trans.is_mock_connection(), - } - } -} - -#[async_trait::async_trait] -impl TransactionTrait for SchemaManagerConnection<'_> { - async fn begin(&self) -> Result { - match self { - SchemaManagerConnection::Connection(conn) => conn.begin().await, - SchemaManagerConnection::Transaction(trans) => trans.begin().await, - } - } - - async fn begin_with_config( - &self, - isolation_level: Option, - access_mode: Option, - ) -> Result { - match self { - SchemaManagerConnection::Connection(conn) => { - conn.begin_with_config(isolation_level, access_mode).await - } - SchemaManagerConnection::Transaction(trans) => { - trans.begin_with_config(isolation_level, access_mode).await - } - } - } - - async fn transaction(&self, callback: F) -> Result> - where - F: for<'a> FnOnce( - &'a DatabaseTransaction, - ) -> Pin> + Send + 'a>> - + Send, - T: Send, - E: std::fmt::Display + std::fmt::Debug + Send, - { - match self { - SchemaManagerConnection::Connection(conn) => conn.transaction(callback).await, - SchemaManagerConnection::Transaction(trans) => trans.transaction(callback).await, - } - } - - async fn transaction_with_config( - &self, - callback: F, - isolation_level: Option, - access_mode: Option, - ) -> Result> - where - F: for<'a> FnOnce( - &'a DatabaseTransaction, - ) -> Pin> + Send + 'a>> - + Send, - T: Send, - E: std::fmt::Display + std::fmt::Debug + Send, - { - match self { - SchemaManagerConnection::Connection(conn) => { - conn.transaction_with_config(callback, isolation_level, access_mode) - .await - } - SchemaManagerConnection::Transaction(trans) => { - trans - .transaction_with_config(callback, isolation_level, access_mode) - .await - } - } - } -} - -pub trait IntoSchemaManagerConnection<'c>: Send -where - Self: 'c, -{ - fn into_schema_manager_connection(self) -> SchemaManagerConnection<'c>; -} - -impl<'c> IntoSchemaManagerConnection<'c> for SchemaManagerConnection<'c> { - fn into_schema_manager_connection(self) -> SchemaManagerConnection<'c> { - self - } -} - -impl<'c> IntoSchemaManagerConnection<'c> for &'c DatabaseConnection { - fn into_schema_manager_connection(self) -> SchemaManagerConnection<'c> { - SchemaManagerConnection::Connection(self) - } -} - -impl<'c> IntoSchemaManagerConnection<'c> for &'c DatabaseTransaction { - fn into_schema_manager_connection(self) -> SchemaManagerConnection<'c> { - SchemaManagerConnection::Transaction(self) - } -} diff --git a/extensions/pagetop-seaorm/src/migration/manager.rs b/extensions/pagetop-seaorm/src/migration/manager.rs deleted file mode 100644 index 91d4b100..00000000 --- a/extensions/pagetop-seaorm/src/migration/manager.rs +++ /dev/null @@ -1,186 +0,0 @@ -use super::{IntoSchemaManagerConnection, SchemaManagerConnection}; -use sea_orm::sea_query::{ - ForeignKeyCreateStatement, ForeignKeyDropStatement, IndexCreateStatement, IndexDropStatement, - SelectStatement, TableAlterStatement, TableCreateStatement, TableDropStatement, - TableRenameStatement, TableTruncateStatement, - extension::postgres::{TypeAlterStatement, TypeCreateStatement, TypeDropStatement}, -}; -use sea_orm::{ConnectionTrait, DbBackend, DbErr, StatementBuilder}; -#[allow(unused_imports)] -use sea_schema::probe::SchemaProbe; - -/// Helper struct for writing migration scripts in migration file -pub struct SchemaManager<'c> { - conn: SchemaManagerConnection<'c>, -} - -impl<'c> SchemaManager<'c> { - pub fn new(conn: T) -> Self - where - T: IntoSchemaManagerConnection<'c>, - { - Self { - conn: conn.into_schema_manager_connection(), - } - } - - pub async fn exec_stmt(&self, stmt: S) -> Result<(), DbErr> - where - S: StatementBuilder, - { - let builder = self.conn.get_database_backend(); - self.conn.execute(builder.build(&stmt)).await.map(|_| ()) - } - - pub fn get_database_backend(&self) -> DbBackend { - self.conn.get_database_backend() - } - - pub fn get_connection(&self) -> &SchemaManagerConnection<'c> { - &self.conn - } -} - -/// Schema Creation -impl SchemaManager<'_> { - pub async fn create_table(&self, stmt: TableCreateStatement) -> Result<(), DbErr> { - self.exec_stmt(stmt).await - } - - pub async fn create_index(&self, stmt: IndexCreateStatement) -> Result<(), DbErr> { - self.exec_stmt(stmt).await - } - - pub async fn create_foreign_key(&self, stmt: ForeignKeyCreateStatement) -> Result<(), DbErr> { - self.exec_stmt(stmt).await - } - - pub async fn create_type(&self, stmt: TypeCreateStatement) -> Result<(), DbErr> { - self.exec_stmt(stmt).await - } -} - -/// Schema Mutation -impl SchemaManager<'_> { - pub async fn alter_table(&self, stmt: TableAlterStatement) -> Result<(), DbErr> { - self.exec_stmt(stmt).await - } - - pub async fn drop_table(&self, stmt: TableDropStatement) -> Result<(), DbErr> { - self.exec_stmt(stmt).await - } - - pub async fn rename_table(&self, stmt: TableRenameStatement) -> Result<(), DbErr> { - self.exec_stmt(stmt).await - } - - pub async fn truncate_table(&self, stmt: TableTruncateStatement) -> Result<(), DbErr> { - self.exec_stmt(stmt).await - } - - pub async fn drop_index(&self, stmt: IndexDropStatement) -> Result<(), DbErr> { - self.exec_stmt(stmt).await - } - - pub async fn drop_foreign_key(&self, stmt: ForeignKeyDropStatement) -> Result<(), DbErr> { - self.exec_stmt(stmt).await - } - - pub async fn alter_type(&self, stmt: TypeAlterStatement) -> Result<(), DbErr> { - self.exec_stmt(stmt).await - } - - pub async fn drop_type(&self, stmt: TypeDropStatement) -> Result<(), DbErr> { - self.exec_stmt(stmt).await - } -} - -/// Schema Inspection. -impl SchemaManager<'_> { - pub async fn has_table(&self, table: T) -> Result - where - T: AsRef, - { - has_table(&self.conn, table).await - } - - pub async fn has_column(&self, _table: T, _column: C) -> Result - where - T: AsRef, - C: AsRef, - { - let _stmt: SelectStatement = match self.conn.get_database_backend() { - #[cfg(feature = "mysql")] - DbBackend::MySql => sea_schema::mysql::MySql.has_column(_table, _column), - #[cfg(feature = "postgres")] - DbBackend::Postgres => sea_schema::postgres::Postgres.has_column(_table, _column), - #[cfg(feature = "sqlite")] - DbBackend::Sqlite => sea_schema::sqlite::Sqlite.has_column(_table, _column), - #[allow(unreachable_patterns)] - other => panic!("{other:?} feature is off"), - }; - - #[allow(unreachable_code)] - let builder = self.conn.get_database_backend(); - let res = self - .conn - .query_one(builder.build(&_stmt)) - .await? - .ok_or_else(|| DbErr::Custom("Failed to check column exists".to_owned()))?; - - res.try_get("", "has_column") - } - - pub async fn has_index(&self, _table: T, _index: I) -> Result - where - T: AsRef, - I: AsRef, - { - let _stmt: SelectStatement = match self.conn.get_database_backend() { - #[cfg(feature = "mysql")] - DbBackend::MySql => sea_schema::mysql::MySql.has_index(_table, _index), - #[cfg(feature = "postgres")] - DbBackend::Postgres => sea_schema::postgres::Postgres.has_index(_table, _index), - #[cfg(feature = "sqlite")] - DbBackend::Sqlite => sea_schema::sqlite::Sqlite.has_index(_table, _index), - #[allow(unreachable_patterns)] - other => panic!("{other:?} feature is off"), - }; - - #[allow(unreachable_code)] - let builder = self.conn.get_database_backend(); - let res = self - .conn - .query_one(builder.build(&_stmt)) - .await? - .ok_or_else(|| DbErr::Custom("Failed to check index exists".to_owned()))?; - - res.try_get("", "has_index") - } -} - -pub(crate) async fn has_table(conn: &C, _table: T) -> Result -where - C: ConnectionTrait, - T: AsRef, -{ - let _stmt: SelectStatement = match conn.get_database_backend() { - #[cfg(feature = "mysql")] - DbBackend::MySql => sea_schema::mysql::MySql.has_table(_table), - #[cfg(feature = "postgres")] - DbBackend::Postgres => sea_schema::postgres::Postgres.has_table(_table), - #[cfg(feature = "sqlite")] - DbBackend::Sqlite => sea_schema::sqlite::Sqlite.has_table(_table), - #[allow(unreachable_patterns)] - other => panic!("{other:?} feature is off"), - }; - - #[allow(unreachable_code)] - let builder = conn.get_database_backend(); - let res = conn - .query_one(builder.build(&_stmt)) - .await? - .ok_or_else(|| DbErr::Custom("Failed to check table exists".to_owned()))?; - - res.try_get("", "has_table") -} diff --git a/extensions/pagetop-seaorm/src/migration/migrator.rs b/extensions/pagetop-seaorm/src/migration/migrator.rs deleted file mode 100644 index d10b4edb..00000000 --- a/extensions/pagetop-seaorm/src/migration/migrator.rs +++ /dev/null @@ -1,617 +0,0 @@ -use std::collections::HashSet; -use std::fmt::Display; -use std::future::Future; -use std::pin::Pin; -use std::time::SystemTime; - -use pagetop::trace::info; - -use sea_orm::sea_query::{ - self, Alias, Expr, ExprTrait, ForeignKey, IntoIden, Order, Query, SelectStatement, SimpleExpr, - Table, extension::postgres::Type, -}; -use sea_orm::{ - ActiveModelTrait, ActiveValue, Condition, ConnectionTrait, DbBackend, DbErr, DeriveIden, - DynIden, EntityTrait, FromQueryResult, Iterable, QueryFilter, Schema, Statement, - TransactionTrait, -}; -#[allow(unused_imports)] -use sea_schema::probe::SchemaProbe; - -use super::{IntoSchemaManagerConnection, MigrationTrait, SchemaManager, seaql_migrations}; - -/// Status of migration -#[derive(Copy, Clone, Debug, PartialEq, Eq)] -pub enum MigrationStatus { - /// Not yet applied - Pending, - /// Applied - Applied, -} - -impl Display for MigrationStatus { - fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - let status = match self { - MigrationStatus::Pending => "Pending", - MigrationStatus::Applied => "Applied", - }; - write!(f, "{status}") - } -} - -pub struct Migration { - migration: Box, - status: MigrationStatus, -} - -impl Migration { - /// Get migration name from MigrationName trait implementation - pub fn name(&self) -> &str { - self.migration.name() - } - - /// Get migration status - pub fn status(&self) -> MigrationStatus { - self.status - } -} - -/// Performing migrations on a database -#[async_trait::async_trait] -pub trait MigratorTrait: Send { - /// Vector of migrations in time sequence - fn migrations() -> Vec>; - - /// Name of the migration table, it is `seaql_migrations` by default - fn migration_table_name() -> DynIden { - seaql_migrations::Entity.into_iden() - } - - /// Get list of migrations wrapped in `Migration` struct - fn get_migration_files() -> Vec { - Self::migrations() - .into_iter() - .map(|migration| Migration { - migration, - status: MigrationStatus::Pending, - }) - .collect() - } - - /// Get list of applied migrations from database - async fn get_migration_models(db: &C) -> Result, DbErr> - where - C: ConnectionTrait, - { - Self::install(db).await?; - let stmt = Query::select() - .table_name(Self::migration_table_name()) - .columns(seaql_migrations::Column::iter().map(IntoIden::into_iden)) - .order_by(seaql_migrations::Column::Version, Order::Asc) - .to_owned(); - let builder = db.get_database_backend(); - seaql_migrations::Model::find_by_statement(builder.build(&stmt)) - .all(db) - .await - } - - /// Get list of migrations with status - async fn get_migration_with_status(db: &C) -> Result, DbErr> - where - C: ConnectionTrait, - { - Self::install(db).await?; - let mut migration_files = Self::get_migration_files(); - let migration_models = Self::get_migration_models(db).await?; - - let migration_in_db: HashSet = migration_models - .into_iter() - .map(|model| model.version) - .collect(); - let migration_in_fs: HashSet = migration_files - .iter() - .map(|file| file.migration.name().to_string()) - .collect(); - - let pending_migrations = &migration_in_fs - &migration_in_db; - for migration_file in migration_files.iter_mut() { - if !pending_migrations.contains(migration_file.migration.name()) { - migration_file.status = MigrationStatus::Applied; - } - } - /* - let missing_migrations_in_fs = &migration_in_db - &migration_in_fs; - let errors: Vec = missing_migrations_in_fs - .iter() - .map(|missing_migration| { - format!("Migration file of version '{missing_migration}' is missing, this migration has been applied but its file is missing") - }).collect(); - - if !errors.is_empty() { - Err(DbErr::Custom(errors.join("\n"))) - } else { */ - Ok(migration_files) - /* } */ - } - - /// Get list of pending migrations - async fn get_pending_migrations(db: &C) -> Result, DbErr> - where - C: ConnectionTrait, - { - Self::install(db).await?; - Ok(Self::get_migration_with_status(db) - .await? - .into_iter() - .filter(|file| file.status == MigrationStatus::Pending) - .collect()) - } - - /// Get list of applied migrations - async fn get_applied_migrations(db: &C) -> Result, DbErr> - where - C: ConnectionTrait, - { - Self::install(db).await?; - Ok(Self::get_migration_with_status(db) - .await? - .into_iter() - .filter(|file| file.status == MigrationStatus::Applied) - .collect()) - } - - /// Create migration table `seaql_migrations` in the database - async fn install(db: &C) -> Result<(), DbErr> - where - C: ConnectionTrait, - { - let builder = db.get_database_backend(); - let table_name = Self::migration_table_name(); - let schema = Schema::new(builder); - let mut stmt = schema - .create_table_from_entity(seaql_migrations::Entity) - .table_name(table_name); - stmt.if_not_exists(); - db.execute(builder.build(&stmt)).await.map(|_| ()) - } - - /// Check the status of all migrations - async fn status(db: &C) -> Result<(), DbErr> - where - C: ConnectionTrait, - { - Self::install(db).await?; - - info!("Checking migration status"); - - for Migration { migration, status } in Self::get_migration_with_status(db).await? { - info!("Migration '{}'... {}", migration.name(), status); - } - - Ok(()) - } - - /// Drop all tables from the database, then reapply all migrations - async fn fresh<'c, C>(db: C) -> Result<(), DbErr> - where - C: IntoSchemaManagerConnection<'c>, - { - exec_with_connection::<'_, _, _>(db, move |manager| { - Box::pin(async move { exec_fresh::(manager).await }) - }) - .await - } - - /// Rollback all applied migrations, then reapply all migrations - async fn refresh<'c, C>(db: C) -> Result<(), DbErr> - where - C: IntoSchemaManagerConnection<'c>, - { - exec_with_connection::<'_, _, _>(db, move |manager| { - Box::pin(async move { - exec_down::(manager, None).await?; - exec_up::(manager, None).await - }) - }) - .await - } - - /// Rollback all applied migrations - async fn reset<'c, C>(db: C) -> Result<(), DbErr> - where - C: IntoSchemaManagerConnection<'c>, - { - exec_with_connection::<'_, _, _>(db, move |manager| { - Box::pin(async move { exec_down::(manager, None).await }) - }) - .await - } - - /// Apply pending migrations - async fn up<'c, C>(db: C, steps: Option) -> Result<(), DbErr> - where - C: IntoSchemaManagerConnection<'c>, - { - exec_with_connection::<'_, _, _>(db, move |manager| { - Box::pin(async move { exec_up::(manager, steps).await }) - }) - .await - } - - /// Rollback applied migrations - async fn down<'c, C>(db: C, steps: Option) -> Result<(), DbErr> - where - C: IntoSchemaManagerConnection<'c>, - { - exec_with_connection::<'_, _, _>(db, move |manager| { - Box::pin(async move { exec_down::(manager, steps).await }) - }) - .await - } -} - -async fn exec_with_connection<'c, C, F>(db: C, f: F) -> Result<(), DbErr> -where - C: IntoSchemaManagerConnection<'c>, - F: for<'b> Fn( - &'b SchemaManager<'_>, - ) -> Pin> + Send + 'b>>, -{ - let db = db.into_schema_manager_connection(); - - match db.get_database_backend() { - DbBackend::Postgres => { - let transaction = db.begin().await?; - let manager = SchemaManager::new(&transaction); - f(&manager).await?; - transaction.commit().await - } - DbBackend::MySql | DbBackend::Sqlite => { - let manager = SchemaManager::new(db); - f(&manager).await - } - } -} - -async fn exec_fresh(manager: &SchemaManager<'_>) -> Result<(), DbErr> -where - M: MigratorTrait + ?Sized, -{ - let db = manager.get_connection(); - - M::install(db).await?; - let db_backend = db.get_database_backend(); - - // Temporarily disable the foreign key check - if db_backend == DbBackend::Sqlite { - info!("Disabling foreign key check"); - db.execute(Statement::from_string( - db_backend, - "PRAGMA foreign_keys = OFF".to_owned(), - )) - .await?; - info!("Foreign key check disabled"); - } - - // Drop all foreign keys - if db_backend == DbBackend::MySql { - info!("Dropping all foreign keys"); - let stmt = query_mysql_foreign_keys(db); - let rows = db.query_all(db_backend.build(&stmt)).await?; - for row in rows.into_iter() { - let constraint_name: String = row.try_get("", "CONSTRAINT_NAME")?; - let table_name: String = row.try_get("", "TABLE_NAME")?; - info!( - "Dropping foreign key '{}' from table '{}'", - constraint_name, table_name - ); - let mut stmt = ForeignKey::drop(); - stmt.table(Alias::new(table_name.as_str())) - .name(constraint_name.as_str()); - db.execute(db_backend.build(&stmt)).await?; - info!("Foreign key '{}' has been dropped", constraint_name); - } - info!("All foreign keys dropped"); - } - - // Drop all tables - let stmt = query_tables(db).await; - let rows = db.query_all(db_backend.build(&stmt)).await?; - for row in rows.into_iter() { - let table_name: String = row.try_get("", "table_name")?; - info!("Dropping table '{}'", table_name); - let mut stmt = Table::drop(); - stmt.table(Alias::new(table_name.as_str())) - .if_exists() - .cascade(); - db.execute(db_backend.build(&stmt)).await?; - info!("Table '{}' has been dropped", table_name); - } - - // Drop all types - if db_backend == DbBackend::Postgres { - info!("Dropping all types"); - let stmt = query_pg_types(db); - let rows = db.query_all(db_backend.build(&stmt)).await?; - for row in rows { - let type_name: String = row.try_get("", "typname")?; - info!("Dropping type '{}'", type_name); - let mut stmt = Type::drop(); - stmt.name(Alias::new(&type_name)); - db.execute(db_backend.build(&stmt)).await?; - info!("Type '{}' has been dropped", type_name); - } - } - - // Restore the foreign key check - if db_backend == DbBackend::Sqlite { - info!("Restoring foreign key check"); - db.execute(Statement::from_string( - db_backend, - "PRAGMA foreign_keys = ON".to_owned(), - )) - .await?; - info!("Foreign key check restored"); - } - - // Reapply all migrations - exec_up::(manager, None).await -} - -async fn exec_up(manager: &SchemaManager<'_>, mut steps: Option) -> Result<(), DbErr> -where - M: MigratorTrait + ?Sized, -{ - let db = manager.get_connection(); - - M::install(db).await?; - /* - if let Some(steps) = steps { - info!("Applying {} pending migrations", steps); - } else { - info!("Applying all pending migrations"); - } - */ - let migrations = M::get_pending_migrations(db).await?.into_iter(); - /* - if migrations.len() == 0 { - info!("No pending migrations"); - } - */ - for Migration { migration, .. } in migrations { - if let Some(steps) = steps.as_mut() { - if steps == &0 { - break; - } - *steps -= 1; - } - info!("Applying migration '{}'", migration.name()); - migration.up(manager).await?; - info!("Migration '{}' has been applied", migration.name()); - let now = SystemTime::now() - .duration_since(SystemTime::UNIX_EPOCH) - .expect("SystemTime before UNIX EPOCH!"); - seaql_migrations::Entity::insert(seaql_migrations::ActiveModel { - version: ActiveValue::Set(migration.name().to_owned()), - applied_at: ActiveValue::Set(now.as_secs() as i64), - }) - .table_name(M::migration_table_name()) - .exec(db) - .await?; - } - - Ok(()) -} - -async fn exec_down(manager: &SchemaManager<'_>, mut steps: Option) -> Result<(), DbErr> -where - M: MigratorTrait + ?Sized, -{ - let db = manager.get_connection(); - - M::install(db).await?; - - if let Some(steps) = steps { - info!("Rolling back {} applied migrations", steps); - } else { - info!("Rolling back all applied migrations"); - } - - let migrations = M::get_applied_migrations(db).await?.into_iter().rev(); - if migrations.len() == 0 { - info!("No applied migrations"); - } - for Migration { migration, .. } in migrations { - if let Some(steps) = steps.as_mut() { - if steps == &0 { - break; - } - *steps -= 1; - } - info!("Rolling back migration '{}'", migration.name()); - migration.down(manager).await?; - info!("Migration '{}' has been rollbacked", migration.name()); - seaql_migrations::Entity::delete_many() - .filter(Expr::col(seaql_migrations::Column::Version).eq(migration.name())) - .table_name(M::migration_table_name()) - .exec(db) - .await?; - } - - Ok(()) -} - -async fn query_tables(db: &C) -> SelectStatement -where - C: ConnectionTrait, -{ - match db.get_database_backend() { - #[cfg(feature = "mysql")] - DbBackend::MySql => sea_schema::mysql::MySql.query_tables(), - #[cfg(feature = "postgres")] - DbBackend::Postgres => sea_schema::postgres::Postgres.query_tables(), - #[cfg(feature = "sqlite")] - DbBackend::Sqlite => sea_schema::sqlite::Sqlite.query_tables(), - #[allow(unreachable_patterns)] - other => panic!("{other:?} feature is off"), - } -} - -fn get_current_schema(db: &C) -> SimpleExpr -where - C: ConnectionTrait, -{ - match db.get_database_backend() { - #[cfg(feature = "mysql")] - DbBackend::MySql => sea_schema::mysql::MySql::get_current_schema(), - #[cfg(feature = "postgres")] - DbBackend::Postgres => sea_schema::postgres::Postgres::get_current_schema(), - #[cfg(feature = "sqlite")] - DbBackend::Sqlite => sea_schema::sqlite::Sqlite::get_current_schema(), - #[allow(unreachable_patterns)] - other => panic!("{other:?} feature is off"), - } -} - -#[derive(DeriveIden)] -enum InformationSchema { - #[sea_orm(iden = "information_schema")] - Schema, - #[sea_orm(iden = "TABLE_NAME")] - TableName, - #[sea_orm(iden = "CONSTRAINT_NAME")] - ConstraintName, - TableConstraints, - TableSchema, - ConstraintType, -} - -fn query_mysql_foreign_keys(db: &C) -> SelectStatement -where - C: ConnectionTrait, -{ - let mut stmt = Query::select(); - stmt.columns([ - InformationSchema::TableName, - InformationSchema::ConstraintName, - ]) - .from(( - InformationSchema::Schema, - InformationSchema::TableConstraints, - )) - .cond_where( - Condition::all() - .add(get_current_schema(db).equals(( - InformationSchema::TableConstraints, - InformationSchema::TableSchema, - ))) - .add( - Expr::col(( - InformationSchema::TableConstraints, - InformationSchema::ConstraintType, - )) - .eq("FOREIGN KEY"), - ), - ); - stmt -} - -#[derive(DeriveIden)] -enum PgType { - Table, - Oid, - Typname, - Typnamespace, - Typelem, -} - -#[derive(DeriveIden)] -enum PgDepend { - Table, - Objid, - Deptype, - Refclassid, -} - -#[derive(DeriveIden)] -enum PgNamespace { - Table, - Oid, - Nspname, -} - -fn query_pg_types(db: &C) -> SelectStatement -where - C: ConnectionTrait, -{ - Query::select() - .column(PgType::Typname) - .from(PgType::Table) - .left_join( - PgNamespace::Table, - Expr::col((PgNamespace::Table, PgNamespace::Oid)) - .equals((PgType::Table, PgType::Typnamespace)), - ) - .left_join( - PgDepend::Table, - Expr::col((PgDepend::Table, PgDepend::Objid)) - .equals((PgType::Table, PgType::Oid)) - .and( - Expr::col((PgDepend::Table, PgDepend::Refclassid)) - .eq(Expr::cust("'pg_extension'::regclass::oid")), - ) - .and(Expr::col((PgDepend::Table, PgDepend::Deptype)).eq(Expr::cust("'e'"))), - ) - .and_where(get_current_schema(db).equals((PgNamespace::Table, PgNamespace::Nspname))) - .and_where(Expr::col((PgType::Table, PgType::Typelem)).eq(0)) - .and_where(Expr::col((PgDepend::Table, PgDepend::Objid)).is_null()) - .take() -} - -trait QueryTable { - type Statement; - - fn table_name(self, table_name: DynIden) -> Self::Statement; -} - -impl QueryTable for SelectStatement { - type Statement = SelectStatement; - - fn table_name(mut self, table_name: DynIden) -> SelectStatement { - self.from(table_name); - self - } -} - -impl QueryTable for sea_query::TableCreateStatement { - type Statement = sea_query::TableCreateStatement; - - fn table_name(mut self, table_name: DynIden) -> sea_query::TableCreateStatement { - self.table(table_name); - self - } -} - -impl QueryTable for sea_orm::Insert -where - A: ActiveModelTrait, -{ - type Statement = sea_orm::Insert; - - fn table_name(mut self, table_name: DynIden) -> sea_orm::Insert { - sea_orm::QueryTrait::query(&mut self).into_table(table_name); - self - } -} - -impl QueryTable for sea_orm::DeleteMany -where - E: EntityTrait, -{ - type Statement = sea_orm::DeleteMany; - - fn table_name(mut self, table_name: DynIden) -> sea_orm::DeleteMany { - sea_orm::QueryTrait::query(&mut self).from_table(table_name); - self - } -} diff --git a/extensions/pagetop-seaorm/src/migration/schema.rs b/extensions/pagetop-seaorm/src/migration/schema.rs deleted file mode 100644 index 0ad92946..00000000 --- a/extensions/pagetop-seaorm/src/migration/schema.rs +++ /dev/null @@ -1,612 +0,0 @@ -//! Adapted from -//! -//! # Database Table Schema Helpers -//! -//! This module defines functions and helpers for creating database table -//! schemas using the `sea-orm` and `sea-query` libraries. -//! -//! # Example -//! -//! The following example shows how the user migration file should be and using -//! the schema helpers to create the Db fields. -//! -//! ```rust -//! use pagetop_seaorm::migration::*; -//! -//! pub struct Migration; -//! -//! #[async_trait::async_trait] -//! impl MigrationTrait for Migration { -//! async fn up(&self, manager: &SchemaManager) -> Result<(), DbErr> { -//! let table = table_auto(Users::Table) -//! .col(pk_auto(Users::Id)) -//! .col(uuid(Users::Pid)) -//! .col(string_uniq(Users::Email)) -//! .col(string(Users::Password)) -//! .col(string(Users::Name)) -//! .col(string_null(Users::ResetToken)) -//! .col(timestamp_null(Users::ResetSentAt)) -//! .to_owned(); -//! manager.create_table(table).await?; -//! Ok(()) -//! } -//! -//! async fn down(&self, manager: &SchemaManager) -> Result<(), DbErr> { -//! manager -//! .drop_table(Table::drop().table(Users::Table).to_owned()) -//! .await -//! } -//! } -//! -//! #[derive(DeriveIden)] -//! pub enum Users { -//! Table, -//! Id, -//! Pid, -//! Email, -//! Name, -//! Password, -//! ResetToken, -//! ResetSentAt, -//! } -//! ``` - -use sea_orm::sea_query::{ - self, Alias, ColumnDef, ColumnType, Expr, Iden, IntoIden, PgInterval, Table, - TableCreateStatement, -}; - -#[derive(Iden)] -enum GeneralIds { - CreatedAt, - UpdatedAt, -} - -/// Wrapping table schema creation. -pub fn table_auto(name: T) -> TableCreateStatement { - timestamps(Table::create().table(name).if_not_exists().take()) -} - -/// Create a primary key column with auto-increment feature. -pub fn pk_auto(name: T) -> ColumnDef { - integer(name).auto_increment().primary_key().take() -} - -/// Create a UUID primary key -pub fn pk_uuid(name: T) -> ColumnDef { - uuid(name).primary_key().take() -} - -pub fn char_len(col: T, length: u32) -> ColumnDef { - ColumnDef::new(col).char_len(length).not_null().take() -} - -pub fn char_len_null(col: T, length: u32) -> ColumnDef { - ColumnDef::new(col).char_len(length).null().take() -} - -pub fn char_len_uniq(col: T, length: u32) -> ColumnDef { - char_len(col, length).unique_key().take() -} - -pub fn char(col: T) -> ColumnDef { - ColumnDef::new(col).char().not_null().take() -} - -pub fn char_null(col: T) -> ColumnDef { - ColumnDef::new(col).char().null().take() -} - -pub fn char_uniq(col: T) -> ColumnDef { - char(col).unique_key().take() -} - -pub fn string_len(col: T, length: u32) -> ColumnDef { - ColumnDef::new(col).string_len(length).not_null().take() -} - -pub fn string_len_null(col: T, length: u32) -> ColumnDef { - ColumnDef::new(col).string_len(length).null().take() -} - -pub fn string_len_uniq(col: T, length: u32) -> ColumnDef { - string_len(col, length).unique_key().take() -} - -pub fn string(col: T) -> ColumnDef { - ColumnDef::new(col).string().not_null().take() -} - -pub fn string_null(col: T) -> ColumnDef { - ColumnDef::new(col).string().null().take() -} - -pub fn string_uniq(col: T) -> ColumnDef { - string(col).unique_key().take() -} - -pub fn text(col: T) -> ColumnDef { - ColumnDef::new(col).text().not_null().take() -} - -pub fn text_null(col: T) -> ColumnDef { - ColumnDef::new(col).text().null().take() -} - -pub fn text_uniq(col: T) -> ColumnDef { - text(col).unique_key().take() -} - -pub fn tiny_integer(col: T) -> ColumnDef { - ColumnDef::new(col).tiny_integer().not_null().take() -} - -pub fn tiny_integer_null(col: T) -> ColumnDef { - ColumnDef::new(col).tiny_integer().null().take() -} - -pub fn tiny_integer_uniq(col: T) -> ColumnDef { - tiny_integer(col).unique_key().take() -} - -pub fn small_integer(col: T) -> ColumnDef { - ColumnDef::new(col).small_integer().not_null().take() -} - -pub fn small_integer_null(col: T) -> ColumnDef { - ColumnDef::new(col).small_integer().null().take() -} - -pub fn small_integer_uniq(col: T) -> ColumnDef { - small_integer(col).unique_key().take() -} - -pub fn integer(col: T) -> ColumnDef { - ColumnDef::new(col).integer().not_null().take() -} - -pub fn integer_null(col: T) -> ColumnDef { - ColumnDef::new(col).integer().null().take() -} - -pub fn integer_uniq(col: T) -> ColumnDef { - integer(col).unique_key().take() -} - -pub fn big_integer(col: T) -> ColumnDef { - ColumnDef::new(col).big_integer().not_null().take() -} - -pub fn big_integer_null(col: T) -> ColumnDef { - ColumnDef::new(col).big_integer().null().take() -} - -pub fn big_integer_uniq(col: T) -> ColumnDef { - big_integer(col).unique_key().take() -} - -pub fn tiny_unsigned(col: T) -> ColumnDef { - ColumnDef::new(col).tiny_unsigned().not_null().take() -} - -pub fn tiny_unsigned_null(col: T) -> ColumnDef { - ColumnDef::new(col).tiny_unsigned().null().take() -} - -pub fn tiny_unsigned_uniq(col: T) -> ColumnDef { - tiny_unsigned(col).unique_key().take() -} - -pub fn small_unsigned(col: T) -> ColumnDef { - ColumnDef::new(col).small_unsigned().not_null().take() -} - -pub fn small_unsigned_null(col: T) -> ColumnDef { - ColumnDef::new(col).small_unsigned().null().take() -} - -pub fn small_unsigned_uniq(col: T) -> ColumnDef { - small_unsigned(col).unique_key().take() -} - -pub fn unsigned(col: T) -> ColumnDef { - ColumnDef::new(col).unsigned().not_null().take() -} - -pub fn unsigned_null(col: T) -> ColumnDef { - ColumnDef::new(col).unsigned().null().take() -} - -pub fn unsigned_uniq(col: T) -> ColumnDef { - unsigned(col).unique_key().take() -} - -pub fn big_unsigned(col: T) -> ColumnDef { - ColumnDef::new(col).big_unsigned().not_null().take() -} - -pub fn big_unsigned_null(col: T) -> ColumnDef { - ColumnDef::new(col).big_unsigned().null().take() -} - -pub fn big_unsigned_uniq(col: T) -> ColumnDef { - big_unsigned(col).unique_key().take() -} - -pub fn float(col: T) -> ColumnDef { - ColumnDef::new(col).float().not_null().take() -} - -pub fn float_null(col: T) -> ColumnDef { - ColumnDef::new(col).float().null().take() -} - -pub fn float_uniq(col: T) -> ColumnDef { - float(col).unique_key().take() -} - -pub fn double(col: T) -> ColumnDef { - ColumnDef::new(col).double().not_null().take() -} - -pub fn double_null(col: T) -> ColumnDef { - ColumnDef::new(col).double().null().take() -} - -pub fn double_uniq(col: T) -> ColumnDef { - double(col).unique_key().take() -} - -pub fn decimal_len(col: T, precision: u32, scale: u32) -> ColumnDef { - ColumnDef::new(col) - .decimal_len(precision, scale) - .not_null() - .take() -} - -pub fn decimal_len_null(col: T, precision: u32, scale: u32) -> ColumnDef { - ColumnDef::new(col) - .decimal_len(precision, scale) - .null() - .take() -} - -pub fn decimal_len_uniq(col: T, precision: u32, scale: u32) -> ColumnDef { - decimal_len(col, precision, scale).unique_key().take() -} - -pub fn decimal(col: T) -> ColumnDef { - ColumnDef::new(col).decimal().not_null().take() -} - -pub fn decimal_null(col: T) -> ColumnDef { - ColumnDef::new(col).decimal().null().take() -} - -pub fn decimal_uniq(col: T) -> ColumnDef { - decimal(col).unique_key().take() -} - -pub fn date_time(col: T) -> ColumnDef { - ColumnDef::new(col).date_time().not_null().take() -} - -pub fn date_time_null(col: T) -> ColumnDef { - ColumnDef::new(col).date_time().null().take() -} - -pub fn date_time_uniq(col: T) -> ColumnDef { - date_time(col).unique_key().take() -} - -pub fn interval( - col: T, - fields: Option, - precision: Option, -) -> ColumnDef { - ColumnDef::new(col) - .interval(fields, precision) - .not_null() - .take() -} - -pub fn interval_null( - col: T, - fields: Option, - precision: Option, -) -> ColumnDef { - ColumnDef::new(col) - .interval(fields, precision) - .null() - .take() -} - -pub fn interval_uniq( - col: T, - fields: Option, - precision: Option, -) -> ColumnDef { - interval(col, fields, precision).unique_key().take() -} - -pub fn timestamp(col: T) -> ColumnDef { - ColumnDef::new(col).timestamp().not_null().take() -} - -pub fn timestamp_null(col: T) -> ColumnDef { - ColumnDef::new(col).timestamp().null().take() -} - -pub fn timestamp_uniq(col: T) -> ColumnDef { - timestamp(col).unique_key().take() -} - -pub fn timestamp_with_time_zone(col: T) -> ColumnDef { - ColumnDef::new(col) - .timestamp_with_time_zone() - .not_null() - .take() -} - -pub fn timestamp_with_time_zone_null(col: T) -> ColumnDef { - ColumnDef::new(col).timestamp_with_time_zone().null().take() -} - -pub fn timestamp_with_time_zone_uniq(col: T) -> ColumnDef { - timestamp_with_time_zone(col).unique_key().take() -} - -pub fn time(col: T) -> ColumnDef { - ColumnDef::new(col).time().not_null().take() -} - -pub fn time_null(col: T) -> ColumnDef { - ColumnDef::new(col).time().null().take() -} - -pub fn time_uniq(col: T) -> ColumnDef { - time(col).unique_key().take() -} - -pub fn date(col: T) -> ColumnDef { - ColumnDef::new(col).date().not_null().take() -} - -pub fn date_null(col: T) -> ColumnDef { - ColumnDef::new(col).date().null().take() -} - -pub fn date_uniq(col: T) -> ColumnDef { - date(col).unique_key().take() -} - -pub fn year(col: T) -> ColumnDef { - ColumnDef::new(col).year().not_null().take() -} - -pub fn year_null(col: T) -> ColumnDef { - ColumnDef::new(col).year().null().take() -} - -pub fn year_uniq(col: T) -> ColumnDef { - year(col).unique_key().take() -} - -pub fn binary_len(col: T, length: u32) -> ColumnDef { - ColumnDef::new(col).binary_len(length).not_null().take() -} - -pub fn binary_len_null(col: T, length: u32) -> ColumnDef { - ColumnDef::new(col).binary_len(length).null().take() -} - -pub fn binary_len_uniq(col: T, length: u32) -> ColumnDef { - binary_len(col, length).unique_key().take() -} - -pub fn binary(col: T) -> ColumnDef { - ColumnDef::new(col).binary().not_null().take() -} - -pub fn binary_null(col: T) -> ColumnDef { - ColumnDef::new(col).binary().null().take() -} - -pub fn binary_uniq(col: T) -> ColumnDef { - binary(col).unique_key().take() -} - -pub fn var_binary(col: T, length: u32) -> ColumnDef { - ColumnDef::new(col).var_binary(length).not_null().take() -} - -pub fn var_binary_null(col: T, length: u32) -> ColumnDef { - ColumnDef::new(col).var_binary(length).null().take() -} - -pub fn var_binary_uniq(col: T, length: u32) -> ColumnDef { - var_binary(col, length).unique_key().take() -} - -pub fn bit(col: T, length: Option) -> ColumnDef { - ColumnDef::new(col).bit(length).not_null().take() -} - -pub fn bit_null(col: T, length: Option) -> ColumnDef { - ColumnDef::new(col).bit(length).null().take() -} - -pub fn bit_uniq(col: T, length: Option) -> ColumnDef { - bit(col, length).unique_key().take() -} - -pub fn varbit(col: T, length: u32) -> ColumnDef { - ColumnDef::new(col).varbit(length).not_null().take() -} - -pub fn varbit_null(col: T, length: u32) -> ColumnDef { - ColumnDef::new(col).varbit(length).null().take() -} - -pub fn varbit_uniq(col: T, length: u32) -> ColumnDef { - varbit(col, length).unique_key().take() -} - -pub fn blob(col: T) -> ColumnDef { - ColumnDef::new(col).blob().not_null().take() -} - -pub fn blob_null(col: T) -> ColumnDef { - ColumnDef::new(col).blob().null().take() -} - -pub fn blob_uniq(col: T) -> ColumnDef { - blob(col).unique_key().take() -} - -pub fn boolean(col: T) -> ColumnDef { - ColumnDef::new(col).boolean().not_null().take() -} - -pub fn boolean_null(col: T) -> ColumnDef { - ColumnDef::new(col).boolean().null().take() -} - -pub fn boolean_uniq(col: T) -> ColumnDef { - boolean(col).unique_key().take() -} - -pub fn money_len(col: T, precision: u32, scale: u32) -> ColumnDef { - ColumnDef::new(col) - .money_len(precision, scale) - .not_null() - .take() -} - -pub fn money_len_null(col: T, precision: u32, scale: u32) -> ColumnDef { - ColumnDef::new(col) - .money_len(precision, scale) - .null() - .take() -} - -pub fn money_len_uniq(col: T, precision: u32, scale: u32) -> ColumnDef { - money_len(col, precision, scale).unique_key().take() -} - -pub fn money(col: T) -> ColumnDef { - ColumnDef::new(col).money().not_null().take() -} - -pub fn money_null(col: T) -> ColumnDef { - ColumnDef::new(col).money().null().take() -} - -pub fn money_uniq(col: T) -> ColumnDef { - money(col).unique_key().take() -} - -pub fn json(col: T) -> ColumnDef { - ColumnDef::new(col).json().not_null().take() -} - -pub fn json_null(col: T) -> ColumnDef { - ColumnDef::new(col).json().null().take() -} - -pub fn json_uniq(col: T) -> ColumnDef { - json(col).unique_key().take() -} - -pub fn json_binary(col: T) -> ColumnDef { - ColumnDef::new(col).json_binary().not_null().take() -} - -pub fn json_binary_null(col: T) -> ColumnDef { - ColumnDef::new(col).json_binary().null().take() -} - -pub fn json_binary_uniq(col: T) -> ColumnDef { - json_binary(col).unique_key().take() -} - -pub fn uuid(col: T) -> ColumnDef { - ColumnDef::new(col).uuid().not_null().take() -} - -pub fn uuid_null(col: T) -> ColumnDef { - ColumnDef::new(col).uuid().null().take() -} - -pub fn uuid_uniq(col: T) -> ColumnDef { - uuid(col).unique_key().take() -} - -pub fn custom(col: T, name: N) -> ColumnDef { - ColumnDef::new(col).custom(name).not_null().take() -} - -pub fn custom_null(col: T, name: N) -> ColumnDef { - ColumnDef::new(col).custom(name).null().take() -} - -pub fn enumeration(col: T, name: N, variants: V) -> ColumnDef -where - T: IntoIden, - N: IntoIden, - S: IntoIden, - V: IntoIterator, -{ - ColumnDef::new(col) - .enumeration(name, variants) - .not_null() - .take() -} - -pub fn enumeration_null(col: T, name: N, variants: V) -> ColumnDef -where - T: IntoIden, - N: IntoIden, - S: IntoIden, - V: IntoIterator, -{ - ColumnDef::new(col) - .enumeration(name, variants) - .null() - .take() -} - -pub fn enumeration_uniq(col: T, name: N, variants: V) -> ColumnDef -where - T: IntoIden, - N: IntoIden, - S: IntoIden, - V: IntoIterator, -{ - enumeration(col, name, variants).unique_key().take() -} - -pub fn array(col: T, elem_type: ColumnType) -> ColumnDef { - ColumnDef::new(col).array(elem_type).not_null().take() -} - -pub fn array_null(col: T, elem_type: ColumnType) -> ColumnDef { - ColumnDef::new(col).array(elem_type).null().take() -} - -pub fn array_uniq(col: T, elem_type: ColumnType) -> ColumnDef { - array(col, elem_type).unique_key().take() -} - -/// Add timestamp columns (`CreatedAt` and `UpdatedAt`) to an existing table. -pub fn timestamps(t: TableCreateStatement) -> TableCreateStatement { - let mut t = t; - t.col(timestamp(GeneralIds::CreatedAt).default(Expr::current_timestamp())) - .col(timestamp(GeneralIds::UpdatedAt).default(Expr::current_timestamp())) - .take() -} - -/// Create an Alias. -pub fn name>(name: T) -> Alias { - Alias::new(name) -} diff --git a/extensions/pagetop-seaorm/src/migration/seaql_migrations.rs b/extensions/pagetop-seaorm/src/migration/seaql_migrations.rs deleted file mode 100644 index 51da9300..00000000 --- a/extensions/pagetop-seaorm/src/migration/seaql_migrations.rs +++ /dev/null @@ -1,15 +0,0 @@ -use sea_orm::entity::prelude::*; - -#[derive(Clone, Debug, PartialEq, Eq, DeriveEntityModel)] -// One should override the name of migration table via `MigratorTrait::migration_table_name` method -#[sea_orm(table_name = "seaql_migrations")] -pub struct Model { - #[sea_orm(primary_key, auto_increment = false)] - pub version: String, - pub applied_at: i64, -} - -#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)] -pub enum Relation {} - -impl ActiveModelBehavior for ActiveModel {} diff --git a/helpers/pagetop-build/Cargo.toml b/helpers/pagetop-build/Cargo.toml index a06bc9ca..aa37e1af 100644 --- a/helpers/pagetop-build/Cargo.toml +++ b/helpers/pagetop-build/Cargo.toml @@ -1,6 +1,7 @@ [package] name = "pagetop-build" version = "0.3.2" +edition = "2021" description = """ Prepara un conjunto de archivos estáticos o archivos SCSS compilados para ser incluidos en el @@ -11,10 +12,9 @@ keywords = ["pagetop", "build", "assets", "resources", "static"] repository.workspace = true homepage.workspace = true -edition.workspace = true license.workspace = true authors.workspace = true [dependencies] -grass.workspace = true +grass = "0.13" pagetop-statics.workspace = true diff --git a/helpers/pagetop-build/README.md b/helpers/pagetop-build/README.md index bb7d3bfa..c5d9c5bd 100644 --- a/helpers/pagetop-build/README.md +++ b/helpers/pagetop-build/README.md @@ -94,7 +94,7 @@ No hay ningún problema en generar más de un conjunto de recursos para cada pro usen nombres diferentes. Normalmente no habrá que acceder a estos módulos; sólo declarar el nombre del conjunto de recursos -en [`serve_static_files!`](https://docs.rs/pagetop/latest/pagetop/macro.serve_static_files.html) +en [`static_files_service!`](https://docs.rs/pagetop/latest/pagetop/macro.static_files_service.html) para configurar un servicio web que sirva los archivos desde la ruta indicada. Por ejemplo: ```rust,ignore @@ -105,7 +105,7 @@ pub struct MyExtension; impl Extension for MyExtension { // Servicio web que publica los recursos de `guides` en `/ruta/a/guides`. fn configure_service(&self, scfg: &mut service::web::ServiceConfig) { - serve_static_files!(scfg, guides => "/ruta/a/guides"); + static_files_service!(scfg, guides => "/ruta/a/guides"); } } ``` diff --git a/helpers/pagetop-build/src/lib.rs b/helpers/pagetop-build/src/lib.rs index eacb6180..774a4af7 100644 --- a/helpers/pagetop-build/src/lib.rs +++ b/helpers/pagetop-build/src/lib.rs @@ -95,7 +95,7 @@ No hay ningún problema en generar más de un conjunto de recursos para cada pro usen nombres diferentes. Normalmente no habrá que acceder a estos módulos; sólo declarar el nombre del conjunto de recursos -en [`serve_static_files!`](https://docs.rs/pagetop/latest/pagetop/macro.serve_static_files.html) +en [`static_files_service!`](https://docs.rs/pagetop/latest/pagetop/macro.static_files_service.html) para configurar un servicio web que sirva los archivos desde la ruta indicada. Por ejemplo: ```rust,ignore @@ -104,10 +104,9 @@ use pagetop::prelude::*; pub struct MyExtension; impl Extension for MyExtension { - /// Registra los recursos de `guides` en el router bajo `/ruta/a/guides`. - fn configure_router(&self, mut router: Router) -> Router { - serve_static_files!(router, [guides] => "/ruta/a/guides"); - router + /// Servicio web que publica los recursos de `guides` en `/ruta/a/guides`. + fn configure_service(&self, scfg: &mut service::web::ServiceConfig) { + static_files_service!(scfg, guides => "/ruta/a/guides"); } } ``` @@ -117,10 +116,10 @@ impl Extension for MyExtension { html_favicon_url = "https://git.cillero.es/manuelcillero/pagetop/raw/branch/main/static/favicon.ico" )] -use grass::{Options, OutputStyle, from_path}; -use pagetop_statics::{ResourceDir, resource_dir}; +use grass::{from_path, Options, OutputStyle}; +use pagetop_statics::{resource_dir, ResourceDir}; -use std::fs::{File, create_dir_all, remove_dir_all}; +use std::fs::{create_dir_all, remove_dir_all, File}; use std::io::Write; use std::path::Path; @@ -203,11 +202,9 @@ impl StaticFilesBundle { where P: AsRef, { - // Crea un directorio temporal único para el archivo CSS (basado en su nombre, para que - // varias llamadas a from_scss en el mismo build.rs no se pisen). + // Crea un directorio temporal para el archivo CSS. let out_dir = std::env::var("OUT_DIR").unwrap(); - let safe_name = target_name.replace(['.', '-'], "_"); - let temp_dir = Path::new(&out_dir).join(format!("from_scss_{safe_name}")); + let temp_dir = Path::new(&out_dir).join("from_scss_files"); // Limpia el directorio temporal de ejecuciones previas, si existe. if temp_dir.exists() { diff --git a/helpers/pagetop-macros/Cargo.toml b/helpers/pagetop-macros/Cargo.toml index 13b5d387..b34d2ec1 100644 --- a/helpers/pagetop-macros/Cargo.toml +++ b/helpers/pagetop-macros/Cargo.toml @@ -1,6 +1,7 @@ [package] name = "pagetop-macros" version = "0.3.0" +edition = "2021" description = """ Una colección de macros que mejoran la experiencia de desarrollo con PageTop. @@ -10,7 +11,6 @@ keywords = ["pagetop", "macros", "proc-macros", "codegen"] repository.workspace = true homepage.workspace = true -edition.workspace = true license.workspace = true authors.workspace = true @@ -18,7 +18,7 @@ authors.workspace = true proc-macro = true [dependencies] -proc-macro2.workspace = true -proc-macro2-diagnostics.workspace = true -quote.workspace = true -syn.workspace = true +proc-macro2 = "1.0" +proc-macro2-diagnostics = { version = "0.10", default-features = false } +quote = "1.0" +syn = { version = "2.0", features = ["full", "extra-traits"] } diff --git a/helpers/pagetop-macros/src/lib.rs b/helpers/pagetop-macros/src/lib.rs index 63349aa0..3a597bff 100644 --- a/helpers/pagetop-macros/src/lib.rs +++ b/helpers/pagetop-macros/src/lib.rs @@ -39,7 +39,7 @@ mod smart_default; use proc_macro::TokenStream; use quote::{quote, quote_spanned}; -use syn::{DeriveInput, parse_macro_input, spanned::Spanned}; +use syn::{parse_macro_input, spanned::Spanned, DeriveInput}; /// Macro para escribir plantillas HTML (basada en [Maud](https://docs.rs/maud)). #[proc_macro] @@ -164,7 +164,7 @@ pub fn derive_auto_default(input: TokenStream) -> TokenStream { /// documentación se mostrará la entrada del método `with_...()`. #[proc_macro_attribute] pub fn builder_fn(_: TokenStream, item: TokenStream) -> TokenStream { - use syn::{FnArg, Ident, ImplItemFn, Pat, ReturnType, TraitItemFn, Type, parse2}; + use syn::{parse2, FnArg, Ident, ImplItemFn, Pat, ReturnType, TraitItemFn, Type}; let ts: proc_macro2::TokenStream = item.clone().into(); @@ -451,7 +451,7 @@ pub fn builder_fn(_: TokenStream, item: TokenStream) -> TokenStream { #[proc_macro_attribute] pub fn main(_: TokenStream, item: TokenStream) -> TokenStream { let mut output: TokenStream = (quote! { - #[::tokio::main] + #[::pagetop::service::rt::main(system = "::pagetop::service::rt::System")] }) .into(); @@ -461,9 +461,6 @@ pub fn main(_: TokenStream, item: TokenStream) -> TokenStream { /// Define funciones de prueba asíncronas para usar con PageTop. /// -/// Usa el *runtime* multi-hilo de **Tokio**, igual que [`#[pagetop::main]`](macro@main), para -/// garantizar compatibilidad con extensiones que ejecutan código asíncrono de forma síncrona. -/// /// # Ejemplo /// /// ```rust,ignore @@ -475,7 +472,7 @@ pub fn main(_: TokenStream, item: TokenStream) -> TokenStream { #[proc_macro_attribute] pub fn test(_: TokenStream, item: TokenStream) -> TokenStream { let mut output: TokenStream = (quote! { - #[::tokio::test(flavor = "multi_thread")] + #[::pagetop::service::rt::test(system = "::pagetop::service::rt::System")] }) .into(); diff --git a/helpers/pagetop-macros/src/maud/ast.rs b/helpers/pagetop-macros/src/maud/ast.rs index c8309ef5..ebd53318 100644 --- a/helpers/pagetop-macros/src/maud/ast.rs +++ b/helpers/pagetop-macros/src/maud/ast.rs @@ -4,7 +4,7 @@ use proc_macro2::TokenStream; use proc_macro2_diagnostics::{Diagnostic, SpanDiagnosticExt}; use quote::ToTokens; use syn::{ - Error, Expr, Ident, Lit, LitBool, LitInt, LitStr, Local, Pat, Stmt, braced, bracketed, + braced, bracketed, ext::IdentExt, parenthesized, parse::{Lookahead1, Parse, ParseStream}, @@ -14,6 +14,7 @@ use syn::{ At, Brace, Bracket, Colon, Comma, Dot, Else, Eq, FatArrow, For, If, In, Let, Match, Minus, Paren, Pound, Question, Semi, Slash, While, }, + Error, Expr, Ident, Lit, LitBool, LitInt, LitStr, Local, Pat, Stmt, }; #[derive(Debug, Clone)] @@ -212,7 +213,6 @@ impl DiagnosticParse for Element { || input.peek(Lit) || input.peek(Dot) || input.peek(Pound) - || input.peek(Paren) { let attr = input.diagnostic_parse(diagnostics)?; @@ -347,10 +347,6 @@ pub enum Attribute { name: HtmlName, attr_type: AttributeType, }, - Splice { - paren_token: Paren, - expr: Expr, - }, } impl DiagnosticParse for Attribute { @@ -379,12 +375,6 @@ impl DiagnosticParse for Attribute { pound_token: input.parse()?, name: input.diagnostic_parse(diagnostics)?, }) - } else if lookahead.peek(Paren) { - let content; - Ok(Self::Splice { - paren_token: parenthesized!(content in input), - expr: content.parse()?, - }) } else { let name = input.diagnostic_parse::(diagnostics)?; @@ -435,11 +425,6 @@ impl ToTokens for Attribute { name.to_tokens(tokens); attr_type.to_tokens(tokens); } - Self::Splice { paren_token, expr } => { - paren_token.surround(tokens, |tokens| { - expr.to_tokens(tokens); - }); - } } } } @@ -1094,7 +1079,7 @@ impl ToTokens for MatchArm { pub trait DiagnosticParse: Sized { fn diagnostic_parse(input: ParseStream, diagnostics: &mut Vec) - -> syn::Result; + -> syn::Result; } impl DiagnosticParse for Box { diff --git a/helpers/pagetop-macros/src/maud/generate.rs b/helpers/pagetop-macros/src/maud/generate.rs index ed2fa214..19ff3d76 100644 --- a/helpers/pagetop-macros/src/maud/generate.rs +++ b/helpers/pagetop-macros/src/maud/generate.rs @@ -1,6 +1,6 @@ use proc_macro2::{Ident, Span, TokenStream}; -use quote::{ToTokens, quote}; -use syn::{Expr, Local, parse_quote, token::Brace}; +use quote::{quote, ToTokens}; +use syn::{parse_quote, token::Brace, Expr, Local}; use crate::maud::{ast::*, escape}; @@ -139,7 +139,7 @@ impl Generator { } fn attrs(&self, attrs: Vec, build: &mut Builder) { - let (classes, id, named_attrs, spliced) = split_attrs(attrs); + let (classes, id, named_attrs) = split_attrs(attrs); if !classes.is_empty() { let mut toggle_class_exprs = vec![]; @@ -184,9 +184,6 @@ impl Generator { for (name, attr_type) in named_attrs { self.attr(name, attr_type, build); } - for expr in spliced { - self.splice(expr, build); - } } fn control_flow>(&self, control_flow: ControlFlow, build: &mut Builder) { @@ -319,12 +316,10 @@ fn split_attrs( Vec<(HtmlNameOrMarkup, Option)>, Option, Vec<(HtmlName, AttributeType)>, - Vec, ) { let mut classes = vec![]; let mut id = None; let mut named_attrs = vec![]; - let mut spliced = vec![]; for attr in attrs { match attr { @@ -333,11 +328,10 @@ fn split_attrs( } Attribute::Id { name, .. } => id = Some(name), Attribute::Named { name, attr_type } => named_attrs.push((name, attr_type)), - Attribute::Splice { expr, .. } => spliced.push(expr), } } - (classes, id, named_attrs, spliced) + (classes, id, named_attrs) } //////////////////////////////////////////////////////// diff --git a/helpers/pagetop-macros/src/smart_default/body_impl.rs b/helpers/pagetop-macros/src/smart_default/body_impl.rs index 68e1663e..f7d59bb5 100644 --- a/helpers/pagetop-macros/src/smart_default/body_impl.rs +++ b/helpers/pagetop-macros/src/smart_default/body_impl.rs @@ -1,9 +1,9 @@ use proc_macro2::TokenStream; use quote::quote; -use syn::DeriveInput; use syn::parse::Error; use syn::spanned::Spanned; +use syn::DeriveInput; use crate::smart_default::default_attr::{ConversionStrategy, DefaultAttr}; use crate::smart_default::util::find_only; @@ -68,7 +68,7 @@ fn default_body_tt(body: &syn::Fields) -> Result<(TokenStream, String), Error> { let mut doc = String::new(); use std::fmt::Write; let body_tt = match body { - syn::Fields::Named(fields) => { + syn::Fields::Named(ref fields) => { doc.push_str(" {"); let result = { let field_assignments = fields @@ -101,7 +101,7 @@ fn default_body_tt(body: &syn::Fields) -> Result<(TokenStream, String), Error> { doc.push('}'); result } - syn::Fields::Unnamed(fields) => { + syn::Fields::Unnamed(ref fields) => { doc.push('('); let result = { let field_assignments = fields diff --git a/helpers/pagetop-macros/src/smart_default/default_attr.rs b/helpers/pagetop-macros/src/smart_default/default_attr.rs index 90e52f64..8487fc06 100644 --- a/helpers/pagetop-macros/src/smart_default/default_attr.rs +++ b/helpers/pagetop-macros/src/smart_default/default_attr.rs @@ -1,6 +1,6 @@ use proc_macro2::TokenStream; use quote::ToTokens; -use syn::{MetaNameValue, parse::Error}; +use syn::{parse::Error, MetaNameValue}; use crate::smart_default::util::find_only; diff --git a/helpers/pagetop-minimal/Cargo.toml b/helpers/pagetop-minimal/Cargo.toml index dfb37a9d..39b7d10d 100644 --- a/helpers/pagetop-minimal/Cargo.toml +++ b/helpers/pagetop-minimal/Cargo.toml @@ -1,6 +1,7 @@ [package] name = "pagetop-minimal" version = "0.1.0" +edition = "2021" description = """ Reúne un conjunto mínimo de macros para mejorar el formato y la eficiencia de operaciones @@ -11,11 +12,10 @@ keywords = ["pagetop", "build", "assets", "resources", "static"] repository.workspace = true homepage.workspace = true -edition.workspace = true license.workspace = true authors.workspace = true [dependencies] -concat-string.workspace = true -indoc.workspace = true -pastey.workspace = true +concat-string = "1.0" +indoc = "2.0" +pastey = "0.2" diff --git a/helpers/pagetop-statics/Cargo.toml b/helpers/pagetop-statics/Cargo.toml index 503511eb..da967c31 100644 --- a/helpers/pagetop-statics/Cargo.toml +++ b/helpers/pagetop-statics/Cargo.toml @@ -1,6 +1,7 @@ [package] name = "pagetop-statics" version = "0.1.3" +edition = "2021" description = """ Librería para automatizar la recopilación de recursos estáticos en PageTop. @@ -10,7 +11,6 @@ keywords = ["pagetop", "build", "static", "resources", "file"] repository.workspace = true homepage.workspace = true -edition.workspace = true license.workspace = true authors.workspace = true @@ -19,11 +19,15 @@ default = ["change-detection"] sort = [] [dependencies] -change-detection = { workspace = true, optional = true } -mime_guess.workspace = true -path-slash.workspace = true +change-detection = { version = "1.2", optional = true } +mime_guess = "2.0" +path-slash = "0.2" + +actix-web.workspace = true +derive_more = "0.99.17" +futures-util = { version = "0.3", default-features = false, features = ["std"] } [build-dependencies] -change-detection = { workspace = true, optional = true } -mime_guess.workspace = true -path-slash.workspace = true +change-detection = { version = "1.2", optional = true } +mime_guess = "2.0" +path-slash = "0.2" diff --git a/helpers/pagetop-statics/README.md b/helpers/pagetop-statics/README.md index 3184f095..7466dc1f 100644 --- a/helpers/pagetop-statics/README.md +++ b/helpers/pagetop-statics/README.md @@ -11,25 +11,30 @@ -## Sobre PageTop +## 🧭 Sobre PageTop [PageTop](https://docs.rs/pagetop) es un entorno de desarrollo que reivindica la esencia de la web clásica para crear soluciones web SSR (*renderizadas en el servidor*) modulares, extensibles y configurables, basadas en HTML, CSS y JavaScript. -## Descripción general + +## 🗺️ Descripción general Este *crate* permite incluir archivos estáticos en el ejecutable de las aplicaciones PageTop para servirlos de forma eficiente vía web, con detección de cambios que optimizan el tiempo de compilación. -## Créditos -Para ello, adapta el código de [static-files](https://crates.io/crates/static_files) (versión -[0.2.5](https://github.com/static-files-rs/static-files/tree/v0.2.5)) desarrollado por -[Alexander Korolev](https://crates.io/users/kilork), bajo licencia MIT/Apache 2.0. La implementación -se integra en PageTop para evitar que cada proyecto tenga que declarar `static-files` manualmente -como dependencia en su `Cargo.toml`. +## 📚 Créditos + +Para ello, adapta el código de los *crates* [static-files](https://crates.io/crates/static_files) +(versión [0.2.5](https://github.com/static-files-rs/static-files/tree/v0.2.5)) y +[actix-web-static-files](https://crates.io/crates/actix_web_static_files) (versión +[4.0.1](https://github.com/kilork/actix-web-static-files/tree/v4.0.1)), desarrollados ambos por +[Alexander Korolev](https://crates.io/users/kilork). + +Estas implementaciones se integran en PageTop para evitar que cada proyecto tenga que declarar +`static-files` manualmente como dependencia en su `Cargo.toml`. ## 🚧 Advertencia diff --git a/helpers/pagetop-statics/build.rs b/helpers/pagetop-statics/build.rs index 3cbd6706..fcd009c9 100644 --- a/helpers/pagetop-statics/build.rs +++ b/helpers/pagetop-statics/build.rs @@ -13,7 +13,7 @@ use resource_dir::resource_dir; mod sets { include!("src/sets.rs"); } -use sets::{SplitByCount, generate_resources_sets}; +use sets::{generate_resources_sets, SplitByCount}; use std::{env, path::Path}; diff --git a/helpers/pagetop-statics/src/lib.rs b/helpers/pagetop-statics/src/lib.rs index d72176c6..d2f147e3 100644 --- a/helpers/pagetop-statics/src/lib.rs +++ b/helpers/pagetop-statics/src/lib.rs @@ -26,11 +26,14 @@ compilación. ## Créditos -Para ello, adapta el código de [static-files](https://crates.io/crates/static_files) (versión -[0.2.5](https://github.com/static-files-rs/static-files/tree/v0.2.5)) desarrollado por -[Alexander Korolev](https://crates.io/users/kilork), bajo licencia MIT/Apache 2.0. La implementación -se integra en PageTop para evitar que cada proyecto tenga que declarar `static-files` manualmente -como dependencia en su `Cargo.toml`. +Para ello, adapta el código de los *crates* [static-files](https://crates.io/crates/static_files) +(versión [0.2.5](https://github.com/static-files-rs/static-files/tree/v0.2.5)) y +[actix-web-static-files](https://crates.io/crates/actix_web_static_files) (versión +[4.0.1](https://github.com/kilork/actix-web-static-files/tree/v4.0.1)), desarrollados ambos por +[Alexander Korolev](https://crates.io/users/kilork). + +Estas implementaciones se integran en PageTop para evitar que cada proyecto tenga que declarar +`static-files` manualmente como dependencia en su `Cargo.toml`. */ #![doc(test(no_crate_inject))] @@ -41,10 +44,13 @@ como dependencia en su `Cargo.toml`. /// Resource definition and single module based generation. pub mod resource; -pub use resource::Resource as StaticFile; +pub use resource::Resource as StaticResource; mod resource_dir; -pub use resource_dir::{ResourceDir, resource_dir}; +pub use resource_dir::{resource_dir, ResourceDir}; + +mod resource_files; +pub use resource_files::{ResourceFiles, UriSegmentError}; /// Support for module based generations. Use it for large data sets (more than 128 Mb). pub mod sets; diff --git a/helpers/pagetop-statics/src/resource.rs b/helpers/pagetop-statics/src/resource.rs index 62a31ee7..0b81969e 100644 --- a/helpers/pagetop-statics/src/resource.rs +++ b/helpers/pagetop-statics/src/resource.rs @@ -93,9 +93,9 @@ pub fn generate_resources, G: AsRef>( /// ```rust /// use std::collections::HashMap; /// -/// use pagetop_statics::StaticFile; +/// use pagetop_statics::StaticResource; /// -/// fn generate_mapping() -> HashMap<&'static str, StaticFile> { +/// fn generate_mapping() -> HashMap<&'static str, StaticResource> { /// include!(concat!(env!("OUT_DIR"), "/generated_mapping.rs")) /// } /// @@ -221,7 +221,7 @@ pub(crate) fn generate_function_header( ) -> io::Result<()> { writeln!( f, - "#[allow(clippy::unreadable_literal)] pub fn {fn_name}() -> ::std::collections::HashMap<&'static str, ::{crate_name}::StaticFile> {{", + "#[allow(clippy::unreadable_literal)] pub fn {fn_name}() -> ::std::collections::HashMap<&'static str, ::{crate_name}::StaticResource> {{", ) } diff --git a/helpers/pagetop-statics/src/resource_dir.rs b/helpers/pagetop-statics/src/resource_dir.rs index 41c29829..805e1ed4 100644 --- a/helpers/pagetop-statics/src/resource_dir.rs +++ b/helpers/pagetop-statics/src/resource_dir.rs @@ -1,4 +1,4 @@ -use super::sets::{SplitByCount, generate_resources_sets}; +use super::sets::{generate_resources_sets, SplitByCount}; use std::{ env, io, path::{Path, PathBuf}, diff --git a/helpers/pagetop-statics/src/resource_files.rs b/helpers/pagetop-statics/src/resource_files.rs new file mode 100644 index 00000000..b487bca9 --- /dev/null +++ b/helpers/pagetop-statics/src/resource_files.rs @@ -0,0 +1,396 @@ +use super::resource::Resource; +use actix_web::{ + dev::{ + always_ready, AppService, HttpServiceFactory, ResourceDef, Service, ServiceFactory, + ServiceRequest, ServiceResponse, + }, + error::Error, + guard::{Guard, GuardContext}, + http::{ + header::{self, ContentType}, + Method, StatusCode, + }, + HttpMessage, HttpRequest, HttpResponse, ResponseError, +}; +use derive_more::{Deref, Display, Error}; +use futures_util::future::{ok, FutureExt, LocalBoxFuture, Ready}; +use std::{collections::HashMap, ops::Deref, rc::Rc}; + +/// Static resource files handling +/// +/// `ResourceFiles` service must be registered with `App::service` method. +/// +/// ```rust +/// use std::collections::HashMap; +/// +/// use actix_web::App; +/// +/// fn main() { +/// // serve root directory with default options: +/// // - resolve index.html +/// let files: HashMap<&'static str, pagetop_statics::StaticResource> = HashMap::new(); +/// let app = App::new() +/// .service(pagetop_statics::ResourceFiles::new("/", files)); +/// // or subpath with additional option to not resolve index.html +/// let files: HashMap<&'static str, pagetop_statics::StaticResource> = HashMap::new(); +/// let app = App::new() +/// .service(pagetop_statics::ResourceFiles::new("/imgs", files) +/// .do_not_resolve_defaults()); +/// } +/// ``` +#[allow(clippy::needless_doctest_main)] +pub struct ResourceFiles { + not_resolve_defaults: bool, + use_guard: bool, + not_found_resolves_to: Option, + inner: Rc, +} + +pub struct ResourceFilesInner { + path: String, + files: HashMap<&'static str, Resource>, +} + +const INDEX_HTML: &str = "index.html"; + +impl ResourceFiles { + pub fn new(path: &str, files: HashMap<&'static str, Resource>) -> Self { + let inner = ResourceFilesInner { + path: path.into(), + files, + }; + Self { + inner: Rc::new(inner), + not_resolve_defaults: false, + not_found_resolves_to: None, + use_guard: false, + } + } + + /// By default trying to resolve '.../' to '.../index.html' if it exists. + /// Turn off this resolution by calling this function. + pub fn do_not_resolve_defaults(mut self) -> Self { + self.not_resolve_defaults = true; + self + } + + /// Resolves not found references to this path. + /// + /// This can be useful for angular-like applications. + pub fn resolve_not_found_to(mut self, path: S) -> Self { + self.not_found_resolves_to = Some(path.to_string()); + self + } + + /// Resolves not found references to root path. + /// + /// This can be useful for angular-like applications. + pub fn resolve_not_found_to_root(self) -> Self { + self.resolve_not_found_to(INDEX_HTML) + } + + /// If this is called, we will use an [actix_web::guard::Guard] to check if this request should be handled. + /// If set to true, we skip using the handler for files that haven't been found, instead of sending 404s. + /// Would be ignored, if `resolve_not_found_to` or `resolve_not_found_to_root` is used. + /// + /// Can be useful if you want to share files on a (sub)path that's also used by a different route handler. + pub fn skip_handler_when_not_found(mut self) -> Self { + self.use_guard = true; + self + } + + fn select_guard(&self) -> Box { + if self.not_resolve_defaults { + Box::new(NotResolveDefaultsGuard::from(self)) + } else { + Box::new(ResolveDefaultsGuard::from(self)) + } + } +} + +impl Deref for ResourceFiles { + type Target = ResourceFilesInner; + + fn deref(&self) -> &Self::Target { + &self.inner + } +} + +struct NotResolveDefaultsGuard { + inner: Rc, +} + +impl Guard for NotResolveDefaultsGuard { + fn check(&self, ctx: &GuardContext<'_>) -> bool { + self.inner + .files + .contains_key(ctx.head().uri.path().trim_start_matches('/')) + } +} + +impl From<&ResourceFiles> for NotResolveDefaultsGuard { + fn from(files: &ResourceFiles) -> Self { + Self { + inner: files.inner.clone(), + } + } +} + +struct ResolveDefaultsGuard { + inner: Rc, +} + +impl Guard for ResolveDefaultsGuard { + fn check(&self, ctx: &GuardContext<'_>) -> bool { + let path = ctx.head().uri.path().trim_start_matches('/'); + self.inner.files.contains_key(path) + || ((path.is_empty() || path.ends_with('/')) + && self + .inner + .files + .contains_key((path.to_string() + INDEX_HTML).as_str())) + } +} + +impl From<&ResourceFiles> for ResolveDefaultsGuard { + fn from(files: &ResourceFiles) -> Self { + Self { + inner: files.inner.clone(), + } + } +} + +impl HttpServiceFactory for ResourceFiles { + fn register(self, config: &mut AppService) { + let prefix = self.path.trim_start_matches('/'); + let rdef = if config.is_root() { + ResourceDef::root_prefix(prefix) + } else { + ResourceDef::prefix(prefix) + }; + let guards = if self.use_guard && self.not_found_resolves_to.is_none() { + Some(vec![self.select_guard()]) + } else { + None + }; + config.register_service(rdef, guards, self, None); + } +} + +impl ServiceFactory for ResourceFiles { + type Config = (); + type Response = ServiceResponse; + type Error = Error; + type Service = ResourceFilesService; + type InitError = (); + type Future = LocalBoxFuture<'static, Result>; + + fn new_service(&self, _: ()) -> Self::Future { + ok(ResourceFilesService { + resolve_defaults: !self.not_resolve_defaults, + not_found_resolves_to: self.not_found_resolves_to.clone(), + inner: self.inner.clone(), + }) + .boxed_local() + } +} + +#[derive(Deref)] +pub struct ResourceFilesService { + resolve_defaults: bool, + not_found_resolves_to: Option, + #[deref] + inner: Rc, +} + +impl Service for ResourceFilesService { + type Response = ServiceResponse; + type Error = Error; + type Future = Ready>; + + always_ready!(); + + fn call(&self, req: ServiceRequest) -> Self::Future { + match *req.method() { + Method::HEAD | Method::GET => (), + _ => { + return ok(ServiceResponse::new( + req.into_parts().0, + HttpResponse::MethodNotAllowed() + .insert_header(ContentType::plaintext()) + .insert_header((header::ALLOW, "GET, HEAD")) + .body("This resource only supports GET and HEAD."), + )); + } + } + + let req_path = req.match_info().unprocessed(); + let mut item = self.files.get(req_path); + + if item.is_none() + && self.resolve_defaults + && (req_path.is_empty() || req_path.ends_with('/')) + { + let index_req_path = req_path.to_string() + INDEX_HTML; + item = self.files.get(index_req_path.trim_start_matches('/')); + } + + let (req, response) = if item.is_some() { + let (req, _) = req.into_parts(); + let response = respond_to(&req, item); + (req, response) + } else { + let real_path = match get_pathbuf(req_path) { + Ok(item) => item, + Err(e) => return ok(req.error_response(e)), + }; + + let (req, _) = req.into_parts(); + + let mut item = self.files.get(real_path.as_str()); + + if item.is_none() && self.not_found_resolves_to.is_some() { + let not_found_path = self.not_found_resolves_to.as_ref().unwrap(); + item = self.files.get(not_found_path.as_str()); + } + + let response = respond_to(&req, item); + (req, response) + }; + + ok(ServiceResponse::new(req, response)) + } +} + +fn respond_to(req: &HttpRequest, item: Option<&Resource>) -> HttpResponse { + if let Some(file) = item { + let etag = Some(header::EntityTag::new_strong(format!( + "{:x}:{:x}", + file.data.len(), + file.modified + ))); + + let precondition_failed = !any_match(etag.as_ref(), req); + + let not_modified = !none_match(etag.as_ref(), req); + + let mut resp = HttpResponse::build(StatusCode::OK); + resp.insert_header((header::CONTENT_TYPE, file.mime_type)); + + if let Some(etag) = etag { + resp.insert_header(header::ETag(etag)); + } + + if precondition_failed { + return resp.status(StatusCode::PRECONDITION_FAILED).finish(); + } else if not_modified { + return resp.status(StatusCode::NOT_MODIFIED).finish(); + } + + resp.body(file.data) + } else { + HttpResponse::NotFound().body("Not found") + } +} + +/// Returns true if `req` has no `If-Match` header or one which matches `etag`. +fn any_match(etag: Option<&header::EntityTag>, req: &HttpRequest) -> bool { + match req.get_header::() { + None | Some(header::IfMatch::Any) => true, + Some(header::IfMatch::Items(ref items)) => { + if let Some(some_etag) = etag { + for item in items { + if item.strong_eq(some_etag) { + return true; + } + } + } + false + } + } +} + +/// Returns true if `req` doesn't have an `If-None-Match` header matching `req`. +fn none_match(etag: Option<&header::EntityTag>, req: &HttpRequest) -> bool { + match req.get_header::() { + Some(header::IfNoneMatch::Any) => false, + Some(header::IfNoneMatch::Items(ref items)) => { + if let Some(some_etag) = etag { + for item in items { + if item.weak_eq(some_etag) { + return false; + } + } + } + true + } + None => true, + } +} + +/// Error type representing invalid characters in a URI path segment. +/// +/// This enum is used to report specific formatting errors in individual segments of a URI path, +/// such as starting, ending, or containing disallowed characters. Each variant wraps the offending +/// character that caused the error. +#[derive(Debug, PartialEq, Display, Error)] +pub enum UriSegmentError { + /// The segment started with the wrapped invalid character. + #[display(fmt = "The segment started with the wrapped invalid character")] + BadStart(#[error(not(source))] char), + + /// The segment contained the wrapped invalid character. + #[display(fmt = "The segment contained the wrapped invalid character")] + BadChar(#[error(not(source))] char), + + /// The segment ended with the wrapped invalid character. + #[display(fmt = "The segment ended with the wrapped invalid character")] + BadEnd(#[error(not(source))] char), +} + +#[cfg(test)] +mod tests_error_impl { + use super::*; + + fn assert_send_and_sync() {} + + #[test] + fn test_error_impl() { + // ensure backwards compatibility when migrating away from failure + assert_send_and_sync::(); + } +} + +/// Return `BadRequest` for `UriSegmentError` +impl ResponseError for UriSegmentError { + fn error_response(&self) -> HttpResponse { + HttpResponse::new(StatusCode::BAD_REQUEST) + } +} + +fn get_pathbuf(path: &str) -> Result { + let mut buf = Vec::new(); + for segment in path.split('/') { + if segment == ".." { + buf.pop(); + } else if segment.starts_with('.') { + return Err(UriSegmentError::BadStart('.')); + } else if segment.starts_with('*') { + return Err(UriSegmentError::BadStart('*')); + } else if segment.ends_with(':') { + return Err(UriSegmentError::BadEnd(':')); + } else if segment.ends_with('>') { + return Err(UriSegmentError::BadEnd('>')); + } else if segment.ends_with('<') { + return Err(UriSegmentError::BadEnd('<')); + } else if segment.is_empty() { + continue; + } else if cfg!(windows) && segment.contains('\\') { + return Err(UriSegmentError::BadChar('\\')); + } else { + buf.push(segment) + } + } + + Ok(buf.join("/")) +} diff --git a/helpers/pagetop-statics/src/sets.rs b/helpers/pagetop-statics/src/sets.rs index e319de0f..1d9299df 100644 --- a/helpers/pagetop-statics/src/sets.rs +++ b/helpers/pagetop-statics/src/sets.rs @@ -5,8 +5,8 @@ use std::{ }; use super::resource::{ - DEFAULT_VARIABLE_NAME, collect_resources, generate_function_end, generate_function_header, - generate_resource_insert, generate_uses, generate_variable_header, generate_variable_return, + collect_resources, generate_function_end, generate_function_header, generate_resource_insert, + generate_uses, generate_variable_header, generate_variable_return, DEFAULT_VARIABLE_NAME, }; /// Defines the split strategie. @@ -116,7 +116,7 @@ where writeln!( module_file, " -use ::{crate_name}::StaticFile; +use ::{crate_name}::StaticResource; use ::std::collections::HashMap;" )?; @@ -177,7 +177,7 @@ fn create_set_module_file(module_dir: &Path, module_index: usize) -> io::Result< "#[allow(clippy::wildcard_imports)] use super::*; #[allow(clippy::unreadable_literal)] -pub(crate) fn generate({DEFAULT_VARIABLE_NAME}: &mut HashMap<&'static str, StaticFile>) {{", +pub(crate) fn generate({DEFAULT_VARIABLE_NAME}: &mut HashMap<&'static str, StaticResource>) {{", )?; Ok(set_module) diff --git a/rustfmt.toml b/rustfmt.toml deleted file mode 100644 index 5d6e629c..00000000 --- a/rustfmt.toml +++ /dev/null @@ -1,8 +0,0 @@ -edition = "2024" -max_width = 100 -hard_tabs = false -tab_spaces = 4 -newline_style = "Auto" - -# Heurísticas por defecto: evitar reformateo agresivo -use_small_heuristics = "Default" diff --git a/src/app.rs b/src/app.rs index 4a009fb7..6a266edc 100644 --- a/src/app.rs +++ b/src/app.rs @@ -5,21 +5,25 @@ mod figfont; use crate::core::{extension, extension::ExtensionRef}; use crate::html::Markup; use crate::locale::Locale; -use crate::response::page::ErrorPage; -use crate::web::{HttpRequest, Router}; -use crate::{PAGETOP_VERSION, global, trace}; +use crate::response::page::{ErrorPage, ResultPage}; +use crate::service::HttpRequest; +use crate::{global, service, trace, PAGETOP_VERSION}; + +use actix_session::config::{BrowserSession, PersistentSession, SessionLifecycle}; +use actix_session::storage::CookieSessionStore; +use actix_session::SessionMiddleware; + +use substring::Substring; -use std::future::Future; use std::io::Error; use std::sync::LazyLock; /// Punto de entrada de una aplicación PageTop. /// -/// No almacena datos, **encapsula** el inicio completo de la configuración y puesta en marcha de la -/// aplicación. Para instanciarla se puede usar [`new()`](Application::new) o -/// [`prepare()`](Application::prepare). Después sólo hay que llamar a [`run()`](Application::run) -/// para ejecutar la aplicación (o a [`test()`](Application::test) si se está preparando un entorno -/// de pruebas). +/// No almacena datos, **encapsula** el inicio completo de configuración y puesta en marcha. Para +/// instanciarla se puede usar [`new()`](Application::new) o [`prepare()`](Application::prepare). +/// Después sólo hay que llamar a [`run()`](Application::run) para ejecutar la aplicación (o a +/// [`test()`](Application::test) si se está preparando un entorno de pruebas). pub struct Application; impl Default for Application { @@ -29,24 +33,24 @@ impl Default for Application { } impl Application { - /// Crea una instancia mínima de la aplicación, sin extensión raíz. - /// - /// Útil para verificar que el servidor arranca correctamente. Para una aplicación real, usa - /// [`prepare()`](Application::prepare) con una extensión raíz. + /// Crea una instancia de la aplicación. pub fn new() -> Self { Self::internal_prepare(None) } /// Prepara una instancia de la aplicación a partir de una extensión raíz. /// - /// Las dependencias se habilitan en orden: primero las que no dependen de ninguna otra, luego - /// las que dependen de extensiones ya habilitadas, y así sucesivamente hasta dejar habilitada - /// la extensión raíz. + /// Esa extensión suele declarar: + /// + /// - Sus propias dependencias (que se habilitarán automáticamente). + /// - Una lista de extensiones que deben deshabilitarse si estuvieran activadas. + /// + /// Esto simplifica el arranque en escenarios complejos. pub fn prepare(root_extension: ExtensionRef) -> Self { Self::internal_prepare(Some(root_extension)) } - // Secuencia de arranque común a new() y prepare(). + /// Método interno para preparar la aplicación, opcionalmente con una extensión. fn internal_prepare(root_extension: Option) -> Self { // Al arrancar muestra una cabecera para la aplicación. Self::show_banner(); @@ -69,10 +73,10 @@ impl Application { Self } - // Muestra la cabecera de arranque si está habilitada en la configuración. + /// Muestra una cabecera para la aplicación basada en la configuración. fn show_banner() { use colored::Colorize; - use terminal_size::{Width, terminal_size}; + use terminal_size::{terminal_size, Width}; if global::SETTINGS.app.startup_banner != global::StartupBanner::Off { // Nombre de la aplicación, ajustado al ancho del terminal si es necesario. @@ -81,8 +85,8 @@ impl Application { if let Some((Width(term_width), _)) = terminal_size() { if term_width >= 80 { let maxlen: usize = ((term_width / 10) - 2).into(); - let mut app: String = app_name.chars().take(maxlen).collect(); - if app_name.chars().count() > maxlen { + let mut app = app_name.substring(0, maxlen).to_string(); + if app_name.len() > maxlen { app = format!("{app}..."); } if let Some(ff) = figfont::FIGFONT.convert(&app) { @@ -99,7 +103,7 @@ impl Application { // Descripción de la aplicación. if !global::SETTINGS.app.description.is_empty() { println!("{}", global::SETTINGS.app.description.cyan()); - } + }; // Versión de PageTop. println!( @@ -110,55 +114,72 @@ impl Application { } } - // Construye el router con las rutas de todas las extensiones habilitadas. - fn build_router() -> Router { - let router = extension::all::configure_routes(Router::new()); - router.fallback(route_not_found) - } - /// Arranca el servidor web de la aplicación. /// - /// Enlaza el puerto del servidor web de forma síncrona (puede fallar con [`std::io::Error`] si - /// el puerto ya está en uso o el proceso carece de permisos) y devuelve un [`Future`] que - /// ejecuta el bucle de atención de peticiones. El patrón habitual es: - /// - /// ```rust,no_run - /// use pagetop::prelude::*; - /// - /// struct MyApp; - /// - /// impl Extension for MyApp {} - /// - /// #[pagetop::main] - /// async fn main() -> std::io::Result<()> { - /// Application::prepare(&MyApp).run()?.await - /// } - /// ``` - pub fn run(self) -> Result>, Error> { - let addr = format!( - "{}:{}", - global::SETTINGS.server.bind_address, - global::SETTINGS.server.bind_port - ); + /// Devuelve [`std::io::Error`] si el *socket* no puede enlazarse (por puerto en uso, permisos, + /// etc.). + pub fn run(self) -> Result { + // Genera clave secreta para firmar y verificar cookies. + let secret_key = service::cookie::Key::generate(); - // Enlaza el puerto de forma síncrona para detectar errores antes del *await*. - let std_listener = std::net::TcpListener::bind(&addr)?; - std_listener.set_nonblocking(true)?; - - let router = Self::build_router(); - - Ok(async move { - let listener = tokio::net::TcpListener::from_std(std_listener)?; - axum::serve(listener, router).await + // Prepara el servidor web. + Ok(service::HttpServer::new(move || { + Self::service_app() + .wrap(tracing_actix_web::TracingLogger::default()) + .wrap( + SessionMiddleware::builder(CookieSessionStore::default(), secret_key.clone()) + .session_lifecycle(match global::SETTINGS.server.session_lifetime { + 0 => SessionLifecycle::BrowserSession(BrowserSession::default()), + _ => SessionLifecycle::PersistentSession( + PersistentSession::default().session_ttl( + service::cookie::time::Duration::seconds( + global::SETTINGS.server.session_lifetime, + ), + ), + ), + }) + .build(), + ) }) + .bind(format!( + "{}:{}", + &global::SETTINGS.server.bind_address, + &global::SETTINGS.server.bind_port + ))? + .run()) } - /// Devuelve el servidor web configurado para usarlo en pruebas de integración. - pub fn test(self) -> Router { - Self::build_router() + /// Prepara el servidor web de la aplicación para pruebas. + pub fn test( + self, + ) -> service::App< + impl service::Factory< + service::Request, + Config = (), + Response = service::Response, + Error = service::Error, + InitError = (), + >, + > { + Self::service_app() + } + + /// Configura el servicio web de la aplicación. + fn service_app() -> service::App< + impl service::Factory< + service::Request, + Config = (), + Response = service::Response, + Error = service::Error, + InitError = (), + >, + > { + service::App::new() + .configure(extension::all::configure_services) + .default_service(service::web::route().to(service_not_found)) } } -async fn route_not_found(request: HttpRequest) -> Result { +async fn service_not_found(request: HttpRequest) -> ResultPage { Err(ErrorPage::NotFound(request)) } diff --git a/src/base/component/intro.rs b/src/base/component/intro.rs index 63902f10..a7ccb2c4 100644 --- a/src/base/component/intro.rs +++ b/src/base/component/intro.rs @@ -114,7 +114,7 @@ impl Component for Intro { fn prepare(&self, cx: &mut Context) -> Result { cx.alter_assets(AssetsOp::AddStyleSheet( - StyleSheet::from("/pagetop/css/intro.css").with_version(PAGETOP_VERSION), + StyleSheet::from("/css/intro.css").with_version(PAGETOP_VERSION), )); if *self.opening() == IntroOpening::PageTop { cx.alter_assets(AssetsOp::AddJavaScript(JavaScript::on_load_async("intro-js", |cx| diff --git a/src/base/extension/welcome.rs b/src/base/extension/welcome.rs index 34040f40..b8739a40 100644 --- a/src/base/extension/welcome.rs +++ b/src/base/extension/welcome.rs @@ -2,11 +2,11 @@ use crate::prelude::*; /// Página de bienvenida de PageTop. /// -/// Se registra automáticamente cuando la aplicación arranca sin extensión raíz. Muestra una página -/// de bienvenida de PageTop en la ruta raíz (`/`) usando el componente [`Intro`]. +/// Esta extensión se instala por defecto si el ajuste de configuración [`global::App::welcome`] es +/// `true`. Muestra una página de bienvenida de PageTop en la ruta raíz (`/`). /// -/// También puede incluirse explícitamente como dependencia de la extensión raíz o de cualquier otra -/// extensión dentro de la estructura de la aplicación. +/// No obstante, cualquier extensión puede sobrescribir este comportamiento si utiliza estas mismas +/// rutas. /// /// Resulta útil en demos o para comprobar rápidamente que el servidor ha arrancado correctamente. pub struct Welcome; @@ -20,12 +20,12 @@ impl Extension for Welcome { L10n::l("welcome_extension_description") } - fn configure_router(&self, router: Router) -> Router { - router.route("/", web::get(home)) + fn configure_service(&self, scfg: &mut service::web::ServiceConfig) { + scfg.route("/", service::web::get().to(home)); } } -async fn home(request: HttpRequest) -> Result { +async fn home(request: HttpRequest) -> ResultPage { let app = &global::SETTINGS.app.name; Page::new(request) diff --git a/src/base/theme/basic.rs b/src/base/theme/basic.rs index 3e6e99e9..34f9088b 100644 --- a/src/base/theme/basic.rs +++ b/src/base/theme/basic.rs @@ -13,12 +13,12 @@ impl Extension for Basic { impl Theme for Basic { fn before_render_page_body(&self, page: &mut Page) { page.alter_assets(AssetsOp::AddStyleSheet( - StyleSheet::from("/pagetop/css/normalize.css") + StyleSheet::from("/css/normalize.css") .with_version("8.0.1") .with_weight(-99), )) .alter_assets(AssetsOp::AddStyleSheet( - StyleSheet::from("/pagetop/css/basic.css") + StyleSheet::from("/css/basic.css") .with_version(PAGETOP_VERSION) .with_weight(-99), )) diff --git a/src/config.rs b/src/config.rs index 6faedfeb..9b7b43d2 100644 --- a/src/config.rs +++ b/src/config.rs @@ -7,11 +7,11 @@ //! **código** de la **configuración**, lo que permite tener configuraciones diferentes para cada //! despliegue, como *dev*, *staging* o *production*, sin modificar el código fuente. //! +//! //! # Orden de carga //! //! Si tu aplicación necesita archivos de configuración, crea un directorio `config` en la raíz del -//! proyecto, al mismo nivel que el archivo *Cargo.toml* o que el binario de la aplicación. Puedes -//! cambiar esta ubicación mediante la variable de entorno `CONFIG_DIR`. +//! proyecto, al mismo nivel que el archivo *Cargo.toml* o que el binario de la aplicación. //! //! PageTop carga en este orden, y siempre de forma opcional, los siguientes archivos TOML: //! @@ -42,6 +42,7 @@ //! Los archivos se combinan en el orden anterior, cada archivo sobrescribe a los anteriores en caso //! de conflicto. //! +//! //! # Cómo añadir opciones de configuración a tu código //! //! Añade [*serde*](https://docs.rs/serde) en tu archivo *Cargo.toml* con la *feature* `derive`: @@ -90,6 +91,7 @@ //! //! Las estructuras de configuración son de **sólo lectura** durante la ejecución. //! +//! //! # Usando tus opciones de configuración //! //! ```rust,ignore @@ -129,14 +131,9 @@ pub static CONFIG_VALUES: LazyLock> = LazyLock::new( let dir = env::var_os("CONFIG_DIR").unwrap_or_else(|| DEFAULT_CONFIG_DIR.into()); let config_dir = util::resolve_absolute_dir(&dir).unwrap_or_else(|_| PathBuf::from(&dir)); - // Modo de ejecución. Con la *feature* `testing` activa (usada por `cargo ts` y `cargo tw`), se - // fija en "test" en tiempo de compilación, sin manipular el entorno. En caso contrario se lee - // de PAGETOP_RUN_MODE, o se usa DEFAULT_RUN_MODE si la variable no está definida. - let rm = if cfg!(feature = "testing") { - "test".to_string() - } else { - env::var("PAGETOP_RUN_MODE").unwrap_or_else(|_| DEFAULT_RUN_MODE.into()) - }; + // Modo de ejecución según la variable de entorno PAGETOP_RUN_MODE. Si no está definida, se usa + // por defecto DEFAULT_RUN_MODE (p. ej. PAGETOP_RUN_MODE=production). + let rm = env::var("PAGETOP_RUN_MODE").unwrap_or_else(|_| DEFAULT_RUN_MODE.into()); Config::builder() // 1. Configuración común para todos los entornos (common.toml). @@ -161,7 +158,7 @@ pub static CONFIG_VALUES: LazyLock> = LazyLock::new( /// Hay que añadir en nuestra librería el siguiente código: /// /// ```rust,ignore -/// include_config!(SETTINGS_NAME: SettingsType => [ +/// include_config!(SETTINGS: Settings => [ /// "ruta.clave" => valor, /// // ... /// ]); @@ -171,8 +168,8 @@ pub static CONFIG_VALUES: LazyLock> = LazyLock::new( /// /// * **`SETTINGS_NAME`** es el nombre de la variable global que se usará para referenciar los /// ajustes. Se recomienda usar `SETTINGS`, aunque no es obligatorio. -/// * **`SettingsType`** es la estructura que define los tipos para deserializar la configuración. -/// Debe implementar `Deserialize` (derivable con `#[derive(Deserialize)]`). +/// * **`Settings_Type`** es la referencia a la estructura que define los tipos para deserializar la +/// configuración. Debe implementar `Deserialize` (derivable con `#[derive(Deserialize)]`). /// * **Lista de pares** con las claves TOML que requieran valores por defecto. Siguen la notación /// `"seccion.subclave"` para coincidir con el árbol TOML. /// @@ -214,7 +211,7 @@ pub static CONFIG_VALUES: LazyLock> = LazyLock::new( /// * **Secciones únicas**. Agrupa tus claves dentro de una sección exclusiva (p. ej. `[blog]`) para /// evitar colisiones con otras librerías. /// -/// * **Sólo lectura**. La variable generada es inmutable durante toda la vida del programa. Para +/// * **Solo lectura**. La variable generada es inmutable durante toda la vida del programa. Para /// configurar distintos entornos (*dev*, *staging*, *prod*) usa los archivos TOML descritos en la /// documentación de [`config`](crate::config). /// @@ -223,8 +220,8 @@ pub static CONFIG_VALUES: LazyLock> = LazyLock::new( /// /// # Requisitos /// -/// * Las claves deben coincidir con los campos (*snake case*) de la estructura de ajustes. -/// * Añade `serde` con la *feature* `derive` en *Cargo.toml*: +/// * Dependencia `serde` con la *feature* `derive`. +/// * Las claves deben coincidir con los campos (*snake case*) de tu estructura `Settings_Type`. /// /// ```toml /// [dependencies] @@ -232,10 +229,10 @@ pub static CONFIG_VALUES: LazyLock> = LazyLock::new( /// ``` #[macro_export] macro_rules! include_config { - ( $SETTINGS_NAME:ident : $settings_type:ty => [ $( $k:literal => $v:expr ),* $(,)? ] ) => { + ( $SETTINGS_NAME:ident : $Settings_Type:ty => [ $( $k:literal => $v:expr ),* $(,)? ] ) => { #[doc = concat!( - "Carga [`", stringify!($settings_type), "`] ", - "(y aplica **valores por defecto** en claves no definidas)." + "Ajustes de configuración y **valores por defecto** para ", + "[`", stringify!($Settings_Type), "`]." )] #[doc = ""] #[doc = "Valores predeterminados que se aplican en ausencia de configuración:"] @@ -244,18 +241,17 @@ macro_rules! include_config { #[doc = concat!($k, " = ", stringify!($v))] )* #[doc = "```"] - pub static $SETTINGS_NAME: std::sync::LazyLock<$settings_type> = + pub static $SETTINGS_NAME: std::sync::LazyLock<$Settings_Type> = std::sync::LazyLock::new(|| { let mut settings = $crate::config::CONFIG_VALUES.clone(); $( - settings = settings.set_default($k, $v) - .expect(concat!("Failed to set default for key ", $k)); + settings = settings.set_default($k, $v).unwrap(); )* settings .build() - .expect(concat!("Failed to build config for ", stringify!($settings_type))) - .try_deserialize::<$settings_type>() - .expect(concat!("Error parsing settings for ", stringify!($settings_type))) + .expect(concat!("Failed to build config for ", stringify!($Settings_Type))) + .try_deserialize::<$Settings_Type>() + .expect(concat!("Error parsing settings for ", stringify!($Settings_Type))) }); }; } diff --git a/src/core.rs b/src/core.rs index 03e32a94..8a47848e 100644 --- a/src/core.rs +++ b/src/core.rs @@ -30,22 +30,28 @@ impl TypeInfo { } } - // Extrae un rango de segmentos de `type_name` (tokens separados por `::`). - // - // Los argumentos `start` y `end` identifican los índices de los segmentos teniendo en cuenta: - // - // * Los índices positivos cuentan desde la izquierda, empezando en 0. - // * Los índices negativos cuentan desde la derecha; -1 es el último. - // * Si `end` es `None`, el corte llega hasta el último segmento. - // * Si la selección resulta vacía por índices desordenados o segmento inexistente, devuelve "". - // - // Ejemplos con type_name = "alloc::vec::Vec": - // - // partial(..., 0, None) => "alloc::vec::Vec" - // partial(..., 1, None) => "vec::Vec" - // partial(..., -1, None) => "Vec" - // partial(..., 0, Some(-2)) => "alloc::vec" - // partial(..., -5, None) => "alloc::vec::Vec" + /// Extrae un rango de segmentos de `type_name` (tokens separados por `::`). + /// + /// Los argumentos `start` y `end` identifican los índices de los segmentos teniendo en cuenta: + /// + /// * Los índices positivos cuentan **desde la izquierda**, empezando en `0`. + /// * Los índices negativos cuentan **desde la derecha**, `-1` es el último. + /// * Si `end` es `None`, el corte llega hasta el último segmento. + /// * Si la selección resulta vacía por índices desordenados o segmento inexistente, se devuelve + /// la cadena vacía. + /// + /// Ejemplos (con `type_name = "alloc::vec::Vec"`): + /// + /// | Llamada | Resultado | + /// |------------------------------|--------------------------| + /// | `partial(..., 0, None)` | `"alloc::vec::Vec"` | + /// | `partial(..., 1, None)` | `"vec::Vec"` | + /// | `partial(..., -1, None)` | `"Vec"` | + /// | `partial(..., 0, Some(-2))` | `"alloc::vec"` | + /// | `partial(..., -5, None)` | `"alloc::vec::Vec"` | + /// + /// La porción devuelta vive tanto como `'static` porque `type_name` es `'static` y sólo se + /// presta. fn partial(type_name: &'static str, start: isize, end: Option) -> &'static str { let maxlen = type_name.len(); @@ -53,7 +59,7 @@ impl TypeInfo { let mut segments = Vec::new(); let mut segment_start = 0; // Posición inicial del segmento actual. let mut angle_brackets = 0; // Profundidad dentro de '<...>'. - let mut previous_char = '\0'; // Control, ningún carácter previo aún. + let mut previous_char = '\0'; // Se inicializa a carácter nulo, no hay aún carácter previo. for (idx, c) in type_name.char_indices() { match c { diff --git a/src/core/action/list.rs b/src/core/action/list.rs index f47d3d6e..d60129c1 100644 --- a/src/core/action/list.rs +++ b/src/core/action/list.rs @@ -1,7 +1,7 @@ -use crate::AutoDefault; -use crate::core::AnyCast; use crate::core::action::{ActionBox, ActionDispatcher}; +use crate::core::AnyCast; use crate::trace; +use crate::AutoDefault; use parking_lot::RwLock; diff --git a/src/core/component/children.rs b/src/core/component/children.rs index bfedec14..617a783d 100644 --- a/src/core/component/children.rs +++ b/src/core/component/children.rs @@ -1,6 +1,6 @@ use crate::core::component::{Component, Context}; -use crate::html::{Markup, html}; -use crate::{AutoDefault, UniqueId, builder_fn}; +use crate::html::{html, Markup}; +use crate::{builder_fn, AutoDefault, UniqueId}; use parking_lot::Mutex; diff --git a/src/core/component/context.rs b/src/core/component/context.rs index 9ff7251c..63b2daad 100644 --- a/src/core/component/context.rs +++ b/src/core/component/context.rs @@ -1,13 +1,13 @@ -use crate::core::TypeInfo; use crate::core::component::{ChildOp, Component, MessageLevel, StatusMessage}; use crate::core::theme::all::DEFAULT_THEME; use crate::core::theme::{ChildrenInRegions, DefaultRegion, RegionRef, TemplateRef, ThemeRef}; +use crate::core::TypeInfo; +use crate::html::{html, Markup, RoutePath}; use crate::html::{Assets, Favicon, JavaScript, StyleSheet}; -use crate::html::{Markup, RoutePath, html}; use crate::locale::L10n; use crate::locale::{LangId, LanguageIdentifier, RequestLocale}; -use crate::web::HttpRequest; -use crate::{CowStr, builder_fn, util}; +use crate::service::HttpRequest; +use crate::{builder_fn, util, CowStr}; use std::any::Any; use std::cell::Cell; diff --git a/src/core/component/definition.rs b/src/core/component/definition.rs index b7ceaa9a..718e3b37 100644 --- a/src/core/component/definition.rs +++ b/src/core/component/definition.rs @@ -2,7 +2,7 @@ use crate::base::action; use crate::core::component::{ComponentError, Context, Contextual}; use crate::core::theme::ThemeRef; use crate::core::{AnyInfo, TypeInfo}; -use crate::html::{Markup, html}; +use crate::html::{html, Markup}; /// Permite clonar un componente. /// diff --git a/src/core/component/error.rs b/src/core/component/error.rs index 86f9e4aa..beb7c8f2 100644 --- a/src/core/component/error.rs +++ b/src/core/component/error.rs @@ -1,4 +1,4 @@ -use crate::html::{Markup, html}; +use crate::html::{html, Markup}; use crate::{AutoDefault, Getters}; /// Error producido durante el renderizado de un componente. diff --git a/src/core/extension/all.rs b/src/core/extension/all.rs index f9081d83..b787c9a8 100644 --- a/src/core/extension/all.rs +++ b/src/core/extension/all.rs @@ -1,43 +1,60 @@ use crate::core::action::add_action; use crate::core::extension::ExtensionRef; use crate::core::theme::all::THEMES; -use crate::web::Router; -use crate::{global, serve_static_files, trace, web}; +use crate::{global, service, static_files_service, trace}; -use std::sync::OnceLock; +use parking_lot::RwLock; -static EXTENSIONS: OnceLock> = OnceLock::new(); +use std::sync::LazyLock; + +// **< EXTENSIONES >******************************************************************************** + +static ENABLED_EXTENSIONS: LazyLock>> = + LazyLock::new(|| RwLock::new(Vec::new())); + +static DROPPED_EXTENSIONS: LazyLock>> = + LazyLock::new(|| RwLock::new(Vec::new())); // **< REGISTRO DE LAS EXTENSIONES >**************************************************************** pub fn register_extensions(root_extension: Option) { - // Garantiza que ocurre sólo una vez cuando los tests se ejecutan en paralelo. - EXTENSIONS.get_or_init(|| { - let mut list: Vec = Vec::new(); + // Prepara la lista de extensiones habilitadas. + let mut enabled_list: Vec = Vec::new(); - // Primero añade el tema básico a la lista de extensiones habilitadas. - add_to_enabled(&mut list, &crate::base::theme::Basic); + // Primero añade el tema básico a la lista de extensiones habilitadas. + add_to_enabled(&mut enabled_list, &crate::base::theme::Basic); - // Si se proporciona la extensión raíz inicial, se añade a las extensiones habilitadas. - if let Some(extension) = root_extension { - add_to_enabled(&mut list, extension); - } + // Si se proporciona una extensión raíz inicial, se añade a la lista de extensiones habilitadas. + if let Some(extension) = root_extension { + add_to_enabled(&mut enabled_list, extension); + } - // Añade la página de bienvenida si no hay extensión raíz. - if root_extension.is_none() { - add_to_enabled(&mut list, &crate::base::extension::Welcome); - } + // Añade la página de bienvenida predefinida si se habilita en la configuración. + if global::SETTINGS.app.welcome { + add_to_enabled(&mut enabled_list, &crate::base::extension::Welcome); + } - list - }); + // Guarda la lista final de extensiones habilitadas. + ENABLED_EXTENSIONS.write().append(&mut enabled_list); + + // Prepara una lista de extensiones deshabilitadas. + let mut dropped_list: Vec = Vec::new(); + + // Si se proporciona una extensión raíz, analiza su lista de dependencias. + if let Some(extension) = root_extension { + add_to_dropped(&mut dropped_list, extension); + } + + // Guarda la lista final de extensiones deshabilitadas. + DROPPED_EXTENSIONS.write().append(&mut dropped_list); } fn add_to_enabled(list: &mut Vec, extension: ExtensionRef) { // Verifica que la extensión no esté en la lista para evitar duplicados. if !list.iter().any(|e| e.type_id() == extension.type_id()) { // Añade primero (en orden inverso) las dependencias de la extensión. - for d in extension.dependencies().into_iter().rev() { - add_to_enabled(list, d); + for d in extension.dependencies().iter().rev() { + add_to_enabled(list, *d); } // Añade la propia extensión a la lista. @@ -60,11 +77,40 @@ fn add_to_enabled(list: &mut Vec, extension: ExtensionRef) { } } +fn add_to_dropped(list: &mut Vec, extension: ExtensionRef) { + // Recorre las extensiones que la actual recomienda deshabilitar. + for d in &extension.drop_extensions() { + // Verifica que la extensión no esté ya en la lista. + if !list.iter().any(|e| e.type_id() == d.type_id()) { + // Comprueba si la extensión está habilitada. Si es así, registra una advertencia. + if ENABLED_EXTENSIONS + .read() + .iter() + .any(|e| e.type_id() == extension.type_id()) + { + trace::warn!( + "Trying to drop \"{}\" extension which is enabled", + extension.short_name() + ); + } else { + // Si la extensión no está habilitada, se añade a la lista y registra la acción. + list.push(*d); + trace::debug!("Extension \"{}\" dropped", d.short_name()); + // Añade recursivamente las dependencias de la extensión eliminada. + // De este modo, todas las dependencias se tienen en cuenta para ser deshabilitadas. + for dependency in &extension.dependencies() { + add_to_dropped(list, *dependency); + } + } + } + } +} + // **< REGISTRO DE LAS ACCIONES >******************************************************************* pub fn register_actions() { - for extension in EXTENSIONS.get().into_iter().flatten() { - for a in extension.actions() { + for extension in ENABLED_EXTENSIONS.read().iter() { + for a in extension.actions().into_iter() { add_action(a); } } @@ -74,28 +120,25 @@ pub fn register_actions() { pub fn initialize_extensions() { trace::info!("Calling application bootstrap"); - for e in EXTENSIONS.get().into_iter().flatten() { - e.initialize(); + for extension in ENABLED_EXTENSIONS.read().iter() { + extension.initialize(); } } -// **< CONFIGURA LAS RUTAS >************************************************************************ +// **< CONFIGURA LOS SERVICIOS >******************************************************************** -pub fn configure_routes(router: Router) -> Router { +pub fn configure_services(scfg: &mut service::web::ServiceConfig) { // Sólo compila durante el desarrollo, para evitar errores 400 en la traza de eventos. #[cfg(debug_assertions)] - let router = router.route( + scfg.route( + // Ruta automática lanzada por Chrome DevTools. "/.well-known/appspecific/com.chrome.devtools.json", - web::get(|| async { web::http::StatusCode::NOT_FOUND }), + service::web::get().to(|| async { service::HttpResponse::NotFound().finish() }), ); - let router = EXTENSIONS - .get() - .into_iter() - .flatten() - .fold(router, |r, e| e.configure_router(r)); + for extension in ENABLED_EXTENSIONS.read().iter() { + extension.configure_service(scfg); + } - serve_static_files!(router, [&global::SETTINGS.dev.pagetop_static_dir, assets] => "/pagetop"); - - router + static_files_service!(scfg, [&global::SETTINGS.dev.pagetop_static_dir, assets] => "/"); } diff --git a/src/core/extension/definition.rs b/src/core/extension/definition.rs index 984a5cc1..a5d2b723 100644 --- a/src/core/extension/definition.rs +++ b/src/core/extension/definition.rs @@ -1,9 +1,8 @@ -use crate::actions; -use crate::core::AnyInfo; use crate::core::action::ActionBox; use crate::core::theme::ThemeRef; +use crate::core::AnyInfo; use crate::locale::L10n; -use crate::web::Router; +use crate::{actions, service}; /// Interfaz común que debe implementar cualquier extensión de PageTop. /// @@ -12,15 +11,15 @@ use crate::web::Router; /// /// ```rust /// # use pagetop::prelude::*; -/// pub struct MyExtension; +/// pub struct Blog; /// -/// impl Extension for MyExtension { +/// impl Extension for Blog { /// fn name(&self) -> L10n { -/// L10n::n("My Extension") +/// L10n::n("Blog") /// } /// /// fn description(&self) -> L10n { -/// L10n::n("Does something useful") +/// L10n::n("Blog system") /// } /// } /// ``` @@ -87,95 +86,31 @@ pub trait Extension: AnyInfo + Send + Sync { /// aceptar cualquier petición HTTP. fn initialize(&self) {} - /// Registra rutas, servicios y capas de la extensión en el servidor web de la aplicación. + /// Configura los servicios web de la extensión, como rutas, *middleware*, acceso a ficheros + /// estáticos, etc., usando [`ServiceConfig`](crate::service::web::ServiceConfig). /// - /// Recibe las rutas acumuladas hasta ese momento, añade lo que la extensión necesite y retorna - /// las rutas con las nuevas modificaciones. La implementación por defecto devuelve las rutas - /// sin cambios. - /// - /// # Operaciones disponibles - /// - /// | Operación | Llamada sobre `router` | - /// |------------------------------------|-------------------------------------------------| - /// | Ruta HTTP | `.route("/path", web::get(handler))` | - /// | Rutas bajo prefijo común | `.nest("/prefix", sub_router)` | - /// | Archivos estáticos | `serve_static_files!(router, [...] => "/path")` | - /// | Capa de *middleware* | `.layer(some_layer)` | - /// | Estado compartido entre *handlers* | `.with_state(my_state)` | - /// - /// # Ejemplos - /// - /// ## Rutas HTTP básicas - /// - /// ```rust - /// # use pagetop::prelude::*; - /// # async fn list_posts() -> &'static str { "" } - /// # async fn view_post() -> &'static str { "" } - /// # async fn create_post() -> &'static str { "" } - /// pub struct Blog; - /// - /// impl Extension for Blog { - /// fn configure_router(&self, router: Router) -> Router { - /// router - /// .route("/posts", web::get(list_posts)) - /// .route("/posts/{id}", web::get(view_post)) - /// .route("/posts/new", web::post(create_post)) - /// } - /// } - /// ``` - /// - /// ## Rutas agrupadas bajo un prefijo - /// - /// ```rust - /// # use pagetop::prelude::*; - /// # async fn dashboard() -> &'static str { "" } - /// # async fn list_users() -> &'static str { "" } - /// pub struct Admin; - /// - /// impl Extension for Admin { - /// fn configure_router(&self, router: Router) -> Router { - /// let admin = Router::new() - /// .route("/dashboard", web::get(dashboard)) - /// .route("/users", web::get(list_users)); - /// - /// router.nest("/admin", admin) - /// } - /// } - /// ``` - /// - /// ## Rutas con capa de *middleware* + /// # Ejemplo /// /// ```rust,ignore /// # use pagetop::prelude::*; - /// pub struct Api; + /// pub struct ExtensionSample; /// - /// impl Extension for Api { - /// fn configure_router(&self, router: Router) -> Router { - /// router - /// .route("/api/data", web::get(get_data)) - /// .layer(auth_layer()) + /// impl Extension for ExtensionSample { + /// fn configure_service(&self, scfg: &mut service::web::ServiceConfig) { + /// scfg.route("/sample", web::get().to(route_sample)); /// } /// } /// ``` + #[allow(unused_variables)] + fn configure_service(&self, scfg: &mut service::web::ServiceConfig) {} + + /// Permite declarar extensiones destinadas a deshabilitar o desinstalar recursos de otras + /// extensiones asociadas a versiones anteriores de la aplicación. /// - /// ## Archivos estáticos - /// - /// La macro [`serve_static_files!`](crate::serve_static_files) sombrea `router` internamente, - /// por lo que el parámetro no necesita `mut`. Sí es necesario devolverlo al final. - /// - /// ```rust,ignore - /// # use pagetop::prelude::*; - /// pub struct MyExtension; - /// - /// impl Extension for MyExtension { - /// fn configure_router(&self, router: Router) -> Router { - /// serve_static_files!(router, [assets] => "/static"); - /// router - /// } - /// } - /// ``` - fn configure_router(&self, router: Router) -> Router { - router + /// Actualmente PageTop no utiliza este método, pero se reserva como *placeholder* para futuras + /// implementaciones. + fn drop_extensions(&self) -> Vec { + vec![] } } diff --git a/src/core/theme.rs b/src/core/theme.rs index 43649db1..a8c1f3a4 100644 --- a/src/core/theme.rs +++ b/src/core/theme.rs @@ -28,9 +28,9 @@ //! mediante *enums* adicionales) para añadir nuevas plantillas o exponer regiones específicas. use crate::core::component::Context; -use crate::html::{Markup, html}; +use crate::html::{html, Markup}; use crate::locale::L10n; -use crate::{AutoDefault, util}; +use crate::{util, AutoDefault}; // **< Region >************************************************************************************* diff --git a/src/core/theme/definition.rs b/src/core/theme/definition.rs index 0b036dd4..17f3b391 100644 --- a/src/core/theme/definition.rs +++ b/src/core/theme/definition.rs @@ -3,10 +3,10 @@ use crate::core::component::{ChildOp, Component, ComponentError, Context, Contex use crate::core::extension::Extension; use crate::core::theme::{DefaultRegion, DefaultTemplate, TemplateRef}; use crate::global; -use crate::html::{Markup, html}; +use crate::html::{html, Markup}; use crate::locale::L10n; use crate::response::page::Page; -use crate::web::http::StatusCode; +use crate::service::http::StatusCode; /// Interfaz común que debe implementar cualquier tema de PageTop. /// diff --git a/src/core/theme/regions.rs b/src/core/theme/regions.rs index a10e3ecc..a2b71ff2 100644 --- a/src/core/theme/regions.rs +++ b/src/core/theme/regions.rs @@ -1,6 +1,6 @@ use crate::core::component::{Child, ChildOp, Children, Component}; use crate::core::theme::{DefaultRegion, RegionRef, ThemeRef}; -use crate::{AutoDefault, UniqueId, builder_fn}; +use crate::{builder_fn, AutoDefault, UniqueId}; use parking_lot::RwLock; diff --git a/src/global.rs b/src/global.rs index 2d7b1b60..8bf753e3 100644 --- a/src/global.rs +++ b/src/global.rs @@ -20,32 +20,35 @@ pub use log_format::LogFormat; include_config!(SETTINGS: Settings => [ // [app] - "app.name" => "PageTop App", - "app.description" => "Developed with the amazing PageTop framework.", - "app.theme" => "Basic", - "app.lang_negotiation" => "Full", - "app.startup_banner" => "Slant", + "app.name" => "PageTop App", + "app.description" => "Developed with the amazing PageTop framework.", + "app.theme" => "Basic", + "app.lang_negotiation" => "Full", + "app.startup_banner" => "Slant", + "app.welcome" => true, // [dev] - "dev.pagetop_static_dir" => "", + "dev.pagetop_static_dir" => "", // [log] - "log.enabled" => true, - "log.tracing" => "Info", - "log.rolling" => "Stdout", - "log.path" => "log", - "log.prefix" => "tracing.log", - "log.format" => "Full", + "log.enabled" => true, + "log.tracing" => "Info", + "log.rolling" => "Stdout", + "log.path" => "log", + "log.prefix" => "tracing.log", + "log.format" => "Full", // [server] - "server.bind_address" => "localhost", - "server.bind_port" => 8080, + "server.bind_address" => "localhost", + "server.bind_port" => 8080, + "server.session_lifetime" => 604_800, ]); // **< Settings >*********************************************************************************** -/// Ajustes para las secciones globales [`App`], [`Dev`], [`Log`] y [`Server`] de [`SETTINGS`]. #[derive(Debug, Deserialize)] +/// Tipos para las secciones globales [`[app]`](App), [`[dev]`](Dev), [`[log]`](Log) y +/// [`[server]`](Server) de [`SETTINGS`]. pub struct Settings { pub app: App, pub dev: Dev, @@ -53,8 +56,8 @@ pub struct Settings { pub server: Server, } -/// Sección **`[app]`** de la configuración. Forma parte de [`Settings`]. #[derive(Debug, Deserialize)] +/// Sección `[app]` de la configuración. Forma parte de [`Settings`]. pub struct App { /// Nombre de la aplicación. pub name: String, @@ -82,13 +85,18 @@ pub struct App { /// Banner ASCII mostrado al inicio: *"Off"* (desactivado), *"Slant"*, *"Small"*, *"Speed"* o /// *"Starwars"*. pub startup_banner: StartupBanner, + /// Activa la página de bienvenida de PageTop. + /// + /// Si está activada, se instala la extensión [`Welcome`](crate::base::extension::Welcome), que + /// ofrece una página de bienvenida predefinida en `"/"`. + pub welcome: bool, /// Modo de ejecución, dado por la variable de entorno `PAGETOP_RUN_MODE`, o *"default"* si no /// está definido. pub run_mode: String, } -/// Sección **`[dev]`** de la configuración. Forma parte de [`Settings`]. #[derive(Debug, Deserialize)] +/// Sección `[dev]` de la configuración. Forma parte de [`Settings`]. pub struct Dev { /// Directorio desde el que servir los archivos estáticos de PageTop. /// @@ -101,14 +109,14 @@ pub struct Dev { pub pagetop_static_dir: String, } -/// Sección **`[log]`** de la configuración. Forma parte de [`Settings`]. #[derive(Debug, Deserialize)] +/// Sección `[log]` de la configuración. Forma parte de [`Settings`]. pub struct Log { /// Gestión de trazas y registro de eventos activada (*true*) o desactivada (*false*). pub enabled: bool, /// Opciones, o combinación de opciones separadas por comas, para filtrar las trazas: *"Error"*, /// *"Warn"*, *"Info"*, *"Debug"* o *"Trace"*. - /// Ejemplo: *"Error,tower_http=Debug,axum::rejection=trace"*. + /// Ejemplo: *"Error,actix_server::builder=Info,tracing_actix_web=Debug"*. pub tracing: String, /// Muestra los mensajes de traza en el terminal (*"Stdout"*) o los vuelca en archivos con /// rotación: *"Daily"*, *"Hourly"*, *"Minutely"* o *"Endless"*. @@ -121,11 +129,15 @@ pub struct Log { pub format: LogFormat, } -/// Sección **`[server]`** de la configuración. Forma parte de [`Settings`]. #[derive(Debug, Deserialize)] +/// Sección `[server]` de la configuración. Forma parte de [`Settings`]. pub struct Server { /// Dirección de enlace para el servidor web. pub bind_address: String, /// Puerto de escucha del servidor web. pub bind_port: u16, + /// Duración de la cookie de sesión en segundos (p. ej., `604_800` para una semana). + /// + /// El valor `0` indica que la cookie permanecerá activa hasta que se cierre el navegador. + pub session_lifetime: i64, } diff --git a/src/html.rs b/src/html.rs index 6020627d..21809c08 100644 --- a/src/html.rs +++ b/src/html.rs @@ -1,7 +1,7 @@ //! HTML en código. mod maud; -pub use maud::{DOCTYPE, Escaper, Markup, PreEscaped, display, html, html_private}; +pub use maud::{display, html, html_private, Escaper, Markup, PreEscaped, DOCTYPE}; mod route; pub use route::RoutePath; diff --git a/src/html/assets.rs b/src/html/assets.rs index 80cb3b26..fe5f5b7c 100644 --- a/src/html/assets.rs +++ b/src/html/assets.rs @@ -3,7 +3,7 @@ pub mod javascript; pub mod stylesheet; use crate::core::component::Context; -use crate::html::{Markup, html}; +use crate::html::{html, Markup}; use crate::{AutoDefault, Weight}; /// Representación genérica de un script [`JavaScript`](crate::html::JavaScript) o una hoja de diff --git a/src/html/assets/favicon.rs b/src/html/assets/favicon.rs index 9d0fb688..1a4174bf 100644 --- a/src/html/assets/favicon.rs +++ b/src/html/assets/favicon.rs @@ -1,5 +1,5 @@ use crate::core::component::Context; -use crate::html::{Markup, html}; +use crate::html::{html, Markup}; use crate::{AutoDefault, CowStr}; /// Un **Favicon** es un recurso gráfico que usa el navegador como icono asociado al sitio. @@ -13,7 +13,7 @@ use crate::{AutoDefault, CowStr}; /// /// > **Nota** /// > Los archivos de los iconos deben estar disponibles en el servidor web de la aplicación. Pueden -/// > servirse usando [`serve_static_files!`](crate::serve_static_files). +/// > servirse usando [`static_files_service!`](crate::static_files_service). /// /// # Ejemplo /// @@ -165,12 +165,14 @@ impl Favicon { } } - // Crea un elemento para el favicon. Infiere el tipo MIME según la extensión. - // - // - `icon_rel`: indica el tipo de recurso (`"icon"`, `"apple-touch-icon"`, etc.). - // - `href`: URL del recurso. - // - `sizes`: tamaños opcionales. - // - `color`: color opcional (solo relevante para `mask-icon`). + /// Centraliza la creación de los elementos ``. + /// + /// - `icon_rel`: indica el tipo de recurso (`"icon"`, `"apple-touch-icon"`, etc.). + /// - `href`: URL del recurso. + /// - `sizes`: tamaños opcionales. + /// - `color`: color opcional (solo relevante para `mask-icon`). + /// + /// También infiere automáticamente el tipo MIME (`type`) según la extensión del archivo. fn add_icon_item( mut self, icon_rel: &'static str, diff --git a/src/html/assets/javascript.rs b/src/html/assets/javascript.rs index 6af0fd55..62126895 100644 --- a/src/html/assets/javascript.rs +++ b/src/html/assets/javascript.rs @@ -1,7 +1,7 @@ use crate::core::component::Context; use crate::html::assets::Asset; -use crate::html::{Markup, PreEscaped, html}; -use crate::{AutoDefault, CowStr, Weight, util}; +use crate::html::{html, Markup, PreEscaped}; +use crate::{util, AutoDefault, CowStr, Weight}; /// Define el origen del recurso JavaScript y cómo debe cargarse en el navegador. /// @@ -39,7 +39,7 @@ enum Source { /// /// > **Nota** /// > Los archivos de los scripts deben estar disponibles en el servidor web de la aplicación. -/// > Pueden servirse usando [`serve_static_files!`](crate::serve_static_files). +/// > Pueden servirse usando [`static_files_service!`](crate::static_files_service). /// /// # Ejemplo /// diff --git a/src/html/assets/stylesheet.rs b/src/html/assets/stylesheet.rs index fb71fd44..5a6d98c5 100644 --- a/src/html/assets/stylesheet.rs +++ b/src/html/assets/stylesheet.rs @@ -1,7 +1,7 @@ use crate::core::component::Context; use crate::html::assets::Asset; -use crate::html::{Markup, PreEscaped, html}; -use crate::{AutoDefault, CowStr, Weight, util}; +use crate::html::{html, Markup, PreEscaped}; +use crate::{util, AutoDefault, CowStr, Weight}; /// Define el origen del recurso CSS y cómo se incluye en el documento. /// @@ -56,7 +56,7 @@ impl TargetMedia { /// /// > **Nota** /// > Las hojas de estilo CSS deben estar disponibles en el servidor web de la aplicación. Pueden -/// > servirse usando [`serve_static_files!`](crate::serve_static_files). +/// > servirse usando [`static_files_service!`](crate::static_files_service). /// /// # Ejemplo /// diff --git a/src/html/attr.rs b/src/html/attr.rs index 8f25a5eb..61f7252c 100644 --- a/src/html/attr.rs +++ b/src/html/attr.rs @@ -1,5 +1,5 @@ use crate::locale::{L10n, LangId}; -use crate::{AutoDefault, builder_fn}; +use crate::{builder_fn, AutoDefault}; /// Valor opcional para atributos HTML. /// diff --git a/src/html/classes.rs b/src/html/classes.rs index 903475ec..3465d6b3 100644 --- a/src/html/classes.rs +++ b/src/html/classes.rs @@ -1,4 +1,4 @@ -use crate::{AutoDefault, builder_fn, util}; +use crate::{builder_fn, util, AutoDefault, CowStr}; use std::collections::HashSet; @@ -7,27 +7,6 @@ use std::collections::HashSet; /// Cada variante opera sobre **una o más clases** proporcionadas como una cadena separada por /// espacios (p. ej. `"btn active"`), que se normalizan internamente a minúsculas en /// [`Classes::with_classes()`]. -/// -/// # Orden de las clases y CSS -/// -/// El navegador aplica los estilos según la especificidad de los selectores y el orden en que las -/// reglas aparecen en la **hoja de estilos**, no por el orden de las clases en el atributo `class`. -/// Por tanto, `"btn active"` y `"active btn"` producen exactamente el mismo resultado visual. -/// -/// Las operaciones [`Add`](Self::Add) y [`Prepend`](Self::Prepend) permiten controlar ese orden -/// únicamente por legibilidad o por convención de proyecto, no porque afecte al comportamiento -/// del navegador. -/// -/// # Reemplazar una clase -/// -/// Para sustituir una clase por otra encadena [`Remove`](Self::Remove) y [`Add`](Self::Add): -/// ```rust -/// # use pagetop::prelude::*; -/// let c = Classes::new("btn btn-primary active") -/// .with_classes(ClassesOp::Remove, "btn-primary") -/// .with_classes(ClassesOp::Add, "btn-secondary"); -/// assert_eq!(c.get(), Some("btn active btn-secondary".to_string())); -/// ``` #[derive(AutoDefault, Clone, Debug, PartialEq)] pub enum ClassesOp { /// Añade las clases que no existan al final. @@ -37,6 +16,9 @@ pub enum ClassesOp { Prepend, /// Elimina las clases indicadas que existan. Remove, + /// Sustituye una o varias clases existentes (indicadas en la variante) por las clases + /// proporcionadas. + Replace(CowStr), /// Alterna presencia/ausencia de una o más clases. /// /// Si en una misma llamada se repite una clase (p. ej. `"a a"`) que ya existe, el resultado @@ -44,7 +26,7 @@ pub enum ClassesOp { /// final). Toggle, /// Sustituye la lista completa por las clases indicadas. - Reset, + Set, } /// Lista de clases CSS normalizadas para el atributo `class` de HTML. @@ -54,8 +36,8 @@ pub enum ClassesOp { /// /// # Normalización /// -/// - El orden de las clases no afecta al resultado en CSS; las operaciones de ordenación -/// ([`Add`](ClassesOp::Add), [`Prepend`](ClassesOp::Prepend)) son puramente estéticas. +/// - Aunque el orden de las clases en el atributo `class` no afecta al resultado en CSS, +/// [`ClassesOp`] ofrece operaciones para controlar su orden de aparición por legibilidad. /// - Solo se acepta una lista de clases con caracteres ASCII. /// - Las clases se almacenan en minúsculas. /// - No se permiten clases duplicadas tras la normalización (por ejemplo, `Btn` y `btn` se @@ -69,8 +51,7 @@ pub enum ClassesOp { /// # use pagetop::prelude::*; /// let classes = Classes::new("Btn btn-primary") /// .with_classes(ClassesOp::Add, "Active") -/// .with_classes(ClassesOp::Remove, "active") -/// .with_classes(ClassesOp::Add, "Disabled") +/// .with_classes(ClassesOp::Replace("active".into()), "Disabled") /// .with_classes(ClassesOp::Remove, "btn-primary"); /// /// assert_eq!(classes.get(), Some("btn disabled".to_string())); @@ -128,6 +109,26 @@ impl Classes { } self.0.retain(|c| !to_remove.contains(c.as_str())); } + ClassesOp::Replace(classes_to_replace) => { + let Some(classes_to_replace) = util::normalize_ascii_or_empty( + classes_to_replace.as_ref(), + "ClassesOp::Replace", + ) else { + return self; + }; + let mut pos = self.0.len(); + let mut replaced = false; + for class in classes_to_replace.as_ref().split_ascii_whitespace() { + if let Some(replace_pos) = self.0.iter().position(|c| c == class) { + self.0.remove(replace_pos); + pos = pos.min(replace_pos); + replaced = true; + } + } + if replaced { + self.add(normalized.as_ref().split_ascii_whitespace(), pos); + } + } ClassesOp::Toggle => { for class in normalized.as_ref().split_ascii_whitespace() { if let Some(pos) = self.0.iter().position(|c| c == class) { @@ -137,7 +138,7 @@ impl Classes { } } } - ClassesOp::Reset => { + ClassesOp::Set => { self.0.clear(); self.add(normalized.as_ref().split_ascii_whitespace(), 0); } @@ -167,11 +168,6 @@ impl Classes { // **< Classes GETTERS >************************************************************************ - /// Devuelve `true` si no hay clases. - pub fn is_empty(&self) -> bool { - self.0.is_empty() - } - /// Devuelve la cadena de clases, si existe. pub fn get(&self) -> Option { if self.0.is_empty() { diff --git a/src/html/logo.rs b/src/html/logo.rs index 7746da7a..d5dcaa0b 100644 --- a/src/html/logo.rs +++ b/src/html/logo.rs @@ -1,7 +1,7 @@ -use crate::AutoDefault; use crate::core::component::Context; -use crate::html::{Markup, html}; +use crate::html::{html, Markup}; use crate::locale::L10n; +use crate::AutoDefault; /// Representación SVG del **logotipo de PageTop** para incrustar en HTML. /// diff --git a/src/html/maud.rs b/src/html/maud.rs index ab1236e4..65360360 100644 --- a/src/html/maud.rs +++ b/src/html/maud.rs @@ -270,14 +270,46 @@ impl Default for PreEscaped { /// ``` pub const DOCTYPE: PreEscaped<&'static str> = PreEscaped(""); -mod axum_support { - use super::PreEscaped; - use axum::response::{Html, IntoResponse, Response}; +mod actix_support { + extern crate alloc; - /// Convierte un bloque de [`Markup`](super::Markup) en una respuesta HTTP HTML 200. - impl IntoResponse for PreEscaped { - fn into_response(self) -> Response { - Html(self.0).into_response() + use core::{ + pin::Pin, + task::{Context, Poll}, + }; + + use crate::html::PreEscaped; + use actix_web::{ + body::{BodySize, MessageBody}, + http::header, + web::Bytes, + HttpRequest, HttpResponse, Responder, + }; + use alloc::string::String; + + impl MessageBody for PreEscaped { + type Error = ::Error; + + fn size(&self) -> BodySize { + self.0.size() + } + + fn poll_next( + mut self: Pin<&mut Self>, + cx: &mut Context<'_>, + ) -> Poll>> { + Pin::new(&mut self.0).poll_next(cx) + } + } + + impl Responder for PreEscaped { + type Body = String; + + fn respond_to(self, _req: &HttpRequest) -> HttpResponse { + HttpResponse::Ok() + .content_type(header::ContentType::html()) + .message_body(self.0) + .unwrap() } } } @@ -286,7 +318,7 @@ mod axum_support { pub mod html_private { extern crate alloc; - use super::{Render, display}; + use super::{display, Render}; use alloc::string::String; use core::fmt::Display; diff --git a/src/html/route.rs b/src/html/route.rs index ae694857..a1efb0d8 100644 --- a/src/html/route.rs +++ b/src/html/route.rs @@ -1,4 +1,4 @@ -use crate::{AutoDefault, CowStr, builder_fn}; +use crate::{builder_fn, AutoDefault, CowStr}; use std::fmt; diff --git a/src/lib.rs b/src/lib.rs index 9e900335..0213e61e 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -53,12 +53,12 @@ use pagetop::prelude::*; struct HelloWorld; impl Extension for HelloWorld { - fn configure_router(&self, router: Router) -> Router { - router.route("/", web::get(hello_world)) + fn configure_service(&self, scfg: &mut service::web::ServiceConfig) { + scfg.route("/", service::web::get().to(hello_world)); } } -async fn hello_world(request: HttpRequest) -> Result { +async fn hello_world(request: HttpRequest) -> ResultPage { Page::new(request) .with_child(Html::with(|_| html! { h1 { "Hello World!" } })) .render() @@ -117,10 +117,10 @@ use std::ops::Deref; /// fn before_render_page_body(&self, page: &mut Page) { /// page /// .alter_assets(AssetsOp::AddStyleSheet( -/// StyleSheet::from("/pagetop/css/normalize.css").with_version("8.0.1"), +/// StyleSheet::from("/css/normalize.css").with_version("8.0.1"), /// )) /// .alter_assets(AssetsOp::AddStyleSheet( -/// StyleSheet::from("/pagetop/css/basic.css").with_version(PAGETOP_VERSION), +/// StyleSheet::from("/css/basic.css").with_version(PAGETOP_VERSION), /// )) /// .alter_assets(AssetsOp::AddStyleSheet( /// StyleSheet::from("/mytheme/styles.css").with_version(env!("CARGO_PKG_VERSION")), @@ -132,28 +132,28 @@ use std::ops::Deref; /// referencia a la versión del *crate* que lo usa. pub const PAGETOP_VERSION: &str = env!("CARGO_PKG_VERSION"); -pub use pagetop_macros::{AutoDefault, builder_fn, html, main, test}; +pub use pagetop_macros::{builder_fn, html, main, test, AutoDefault}; -pub use pagetop_statics::{StaticFile, resource}; +pub use pagetop_statics::{resource, StaticResource}; pub use getter_methods::Getters; /// Contenedor para un conjunto de recursos embebidos. #[derive(AutoDefault)] pub struct StaticResources { - bundle: HashMap<&'static str, StaticFile>, + bundle: HashMap<&'static str, StaticResource>, } impl StaticResources { /// Crea un contenedor para un conjunto de recursos generado por `build.rs` (consultar /// [`pagetop_build`](https://docs.rs/pagetop-build)). - pub fn new(bundle: HashMap<&'static str, StaticFile>) -> Self { + pub fn new(bundle: HashMap<&'static str, StaticResource>) -> Self { Self { bundle } } } impl Deref for StaticResources { - type Target = HashMap<&'static str, StaticFile>; + type Target = HashMap<&'static str, StaticResource>; fn deref(&self) -> &Self::Target { &self.bundle @@ -198,8 +198,8 @@ pub mod datetime; pub mod core; // Respuestas a peticiones web en sus diferentes formatos. pub mod response; -// Gestión del servidor y rutas web. -pub mod web; +// Gestión del servidor y servicios web. +pub mod service; // Reúne acciones, componentes, extensiones y temas predefinidos. pub mod base; // Prepara y ejecuta la aplicación. diff --git a/src/locale/definition.rs b/src/locale/definition.rs index bffc805c..06a07c49 100644 --- a/src/locale/definition.rs +++ b/src/locale/definition.rs @@ -1,7 +1,7 @@ use crate::{global, trace}; use super::languages::LANGUAGES; -use super::{LanguageIdentifier, langid}; +use super::{langid, LanguageIdentifier}; use std::sync::LazyLock; diff --git a/src/locale/l10n.rs b/src/locale/l10n.rs index e75e103d..af5e9535 100644 --- a/src/locale/l10n.rs +++ b/src/locale/l10n.rs @@ -1,5 +1,5 @@ use crate::html::{Markup, PreEscaped}; -use crate::{AutoDefault, CowStr, include_locales}; +use crate::{include_locales, AutoDefault, CowStr}; use super::{LangId, Locale}; diff --git a/src/locale/languages.rs b/src/locale/languages.rs index cda4483d..f1962a14 100644 --- a/src/locale/languages.rs +++ b/src/locale/languages.rs @@ -1,6 +1,6 @@ use crate::util; -use super::{LanguageIdentifier, langid}; +use super::{langid, LanguageIdentifier}; use std::collections::HashMap; use std::sync::LazyLock; diff --git a/src/locale/request.rs b/src/locale/request.rs index 53e4e032..6f3af13d 100644 --- a/src/locale/request.rs +++ b/src/locale/request.rs @@ -1,5 +1,5 @@ use crate::global; -use crate::web::HttpRequest; +use crate::service::HttpRequest; use super::{LangId, LanguageIdentifier, Locale}; diff --git a/src/prelude.rs b/src/prelude.rs index 5e6f7ec1..818bfc91 100644 --- a/src/prelude.rs +++ b/src/prelude.rs @@ -14,8 +14,8 @@ pub use crate::{AutoDefault, CowStr, Getters, StaticResources, UniqueId, Weight} pub use crate::include_config; // crate::locale pub use crate::include_locales; -// crate::web -pub use crate::serve_static_files; +// crate::service +pub use crate::static_files_service; // crate::core::action pub use crate::actions; // crate::core::theme @@ -35,8 +35,8 @@ pub use crate::locale::*; pub use crate::datetime::*; -pub use crate::web; -pub use crate::web::{HttpRequest, Router}; +pub use crate::service; +pub use crate::service::{HttpMessage, HttpRequest, HttpResponse}; pub use crate::core::{AnyCast, AnyInfo, TypeInfo}; @@ -45,7 +45,7 @@ pub use crate::core::component::*; pub use crate::core::extension::*; pub use crate::core::theme::*; -pub use crate::response::{json::*, page::*, redirect::*}; +pub use crate::response::{json::*, page::*, redirect::*, ResponseError}; pub use crate::base::action; pub use crate::base::component::*; diff --git a/src/response.rs b/src/response.rs index 55150b71..4078d420 100644 --- a/src/response.rs +++ b/src/response.rs @@ -1,5 +1,7 @@ //! Respuestas a las peticiones web en sus diferentes formatos. +pub use actix_web::ResponseError; + pub mod page; pub mod json; diff --git a/src/response/json.rs b/src/response/json.rs index 7ef4b402..23b8ab2c 100644 --- a/src/response/json.rs +++ b/src/response/json.rs @@ -1,4 +1,4 @@ -//! Extractor y generador de respuestas JSON (reexporta [`axum::Json`]). +//! Extractor y generador de respuestas JSON (reexporta [`actix_web::web::Json`]). //! //! # Uso como extractor JSON //! @@ -11,10 +11,10 @@ //! struct NuevoUsuario { nombre: String, email: String } //! //! /// Manejador configurado para la ruta POST "/usuarios". -//! async fn crear_usuario(payload: Json) -> web::http::StatusCode { +//! async fn crear_usuario(payload: Json) -> HttpResponse { //! // `payload` ya es `NuevoUsuario`; si la deserialización falla, -//! // devolverá automáticamente 400 Bad Request. -//! web::http::StatusCode::OK +//! // devolverá automáticamente 400 Bad Request con un cuerpo JSON que describe el error. +//! HttpResponse::Ok().finish() //! } //! ``` //! @@ -36,4 +36,4 @@ //! `Json` funciona con cualquier tipo que implemente `serde::Serialize` (para respuestas) y/o //! `serde::Deserialize` (para peticiones). -pub use axum::Json; +pub use actix_web::web::Json; diff --git a/src/response/page.rs b/src/response/page.rs index 2376fd39..d8bd4b16 100644 --- a/src/response/page.rs +++ b/src/response/page.rs @@ -16,16 +16,18 @@ mod error; pub use error::ErrorPage; +pub use actix_web::Result as ResultPage; + use crate::base::action; use crate::core::component::{AssetsOp, ChildOp, Context, ContextError, Contextual}; use crate::core::theme::{DefaultRegion, Region, RegionRef, TemplateRef, ThemeRef}; +use crate::html::{html, Markup, DOCTYPE}; use crate::html::{Assets, Favicon, JavaScript, StyleSheet}; use crate::html::{Attr, AttrId}; use crate::html::{Classes, ClassesOp}; -use crate::html::{DOCTYPE, Markup, html}; use crate::locale::{CharacterDirection, L10n, LangId, LanguageIdentifier}; -use crate::web::HttpRequest; -use crate::{AutoDefault, builder_fn}; +use crate::service::HttpRequest; +use crate::{builder_fn, AutoDefault}; // **< ReservedRegion >***************************************************************************** @@ -225,8 +227,8 @@ impl Page { /// [`Context::langid()`](crate::core::component::Context::langid) e inserta los atributos /// `lang` y `dir` en la etiqueta ``. /// 8. Compone el documento HTML completo (``, ``, ``, ``) y - /// devuelve un [`Result`] con el [`Markup`] final. - pub fn render(&mut self) -> Result { + /// devuelve un [`ResultPage`] con el [`Markup`] final. + pub fn render(&mut self) -> ResultPage { // Acciones específicas del tema antes de renderizar el . self.context.theme().before_render_page_body(self); diff --git a/src/response/page/error.rs b/src/response/page/error.rs index 2c92d02e..fd9959c2 100644 --- a/src/response/page/error.rs +++ b/src/response/page/error.rs @@ -1,7 +1,9 @@ use crate::core::component::Contextual; use crate::locale::L10n; +use crate::response::ResponseError; +use crate::service::http::{header::ContentType, StatusCode}; +use crate::service::{HttpRequest, HttpResponse}; use crate::util; -use crate::web::{HttpRequest, IntoResponse, Response, http}; use super::Page; @@ -29,9 +31,13 @@ pub enum ErrorPage { } impl ErrorPage { - // Renderiza una página de error genérica usando el tema activo. Deriva las claves de - // localización del código de estado (`error_title`, `_alert`, `_help`). Si el - // renderizado falla, escribe el texto plano del código de estado. + /// Función auxiliar para renderizar una página de error genérica usando el tema activo. + /// + /// Construye una [`Page`] a partir de la petición y un prefijo de clave basado en el código de + /// estado (`error`), del que se derivan los textos localizados `error_title`, + /// `error_alert` y `error_help`. + /// + /// Si el renderizado falla, escribe en su lugar el texto plano asociado al código de estado. fn display_error_page(&self, f: &mut fmt::Formatter<'_>, request: &HttpRequest) -> fmt::Result { let mut page = Page::new(request.clone()); let code = self.status_code(); @@ -45,19 +51,7 @@ impl ErrorPage { if let Ok(rendered) = page.render() { write!(f, "{}", rendered.into_string()) } else { - f.write_str(code.as_str()) - } - } - - /// Devuelve el código de estado HTTP asociado a la variante de error. - pub fn status_code(&self) -> http::StatusCode { - match self { - ErrorPage::BadRequest(_) => http::StatusCode::BAD_REQUEST, - ErrorPage::AccessDenied(_) => http::StatusCode::FORBIDDEN, - ErrorPage::NotFound(_) => http::StatusCode::NOT_FOUND, - ErrorPage::InternalError(_) => http::StatusCode::INTERNAL_SERVER_ERROR, - ErrorPage::ServiceUnavailable(_) => http::StatusCode::SERVICE_UNAVAILABLE, - ErrorPage::GatewayTimeout(_) => http::StatusCode::GATEWAY_TIMEOUT, + f.write_str(&code.to_string()) } } } @@ -75,7 +69,7 @@ impl fmt::Display for ErrorPage { if let Ok(rendered) = page.render() { write!(f, "{}", rendered.into_string()) } else { - f.write_str(self.status_code().as_str()) + f.write_str(&self.status_code().to_string()) } } @@ -86,7 +80,7 @@ impl fmt::Display for ErrorPage { if let Ok(rendered) = page.render() { write!(f, "{}", rendered.into_string()) } else { - f.write_str(self.status_code().as_str()) + f.write_str(&self.status_code().to_string()) } } @@ -102,17 +96,22 @@ impl fmt::Display for ErrorPage { } } -/// Convierte un [`ErrorPage`] en una respuesta HTTP con el código de estado adecuado y el cuerpo -/// HTML generado por el tema activo. -impl IntoResponse for ErrorPage { - fn into_response(self) -> Response { - let status = self.status_code(); - let body = self.to_string(); - ( - status, - [(http::header::CONTENT_TYPE, "text/html; charset=utf-8")], - body, - ) - .into_response() +impl ResponseError for ErrorPage { + fn error_response(&self) -> HttpResponse { + HttpResponse::build(self.status_code()) + .insert_header(ContentType::html()) + .body(self.to_string()) + } + + #[rustfmt::skip] + fn status_code(&self) -> StatusCode { + match self { + ErrorPage::BadRequest(_) => StatusCode::BAD_REQUEST, + ErrorPage::AccessDenied(_) => StatusCode::FORBIDDEN, + ErrorPage::NotFound(_) => StatusCode::NOT_FOUND, + ErrorPage::InternalError(_) => StatusCode::INTERNAL_SERVER_ERROR, + ErrorPage::ServiceUnavailable(_) => StatusCode::SERVICE_UNAVAILABLE, + ErrorPage::GatewayTimeout(_) => StatusCode::GATEWAY_TIMEOUT, + } } } diff --git a/src/response/redirect.rs b/src/response/redirect.rs index ebe470f8..a3bec0cd 100644 --- a/src/response/redirect.rs +++ b/src/response/redirect.rs @@ -18,12 +18,12 @@ //! //! - **Respuestas especiales**. -use crate::web::{IntoResponse, Response, http}; +use crate::service::HttpResponse; /// Funciones predefinidas para generar respuestas HTTP de redirección. /// -/// Ofrece atajos para construir respuestas con el código de estado apropiado y la cabecera -/// `Location`, evitando repetir la misma secuencia en cada controlador. +/// Ofrece atajos para construir respuestas con el código de estado apropiado, añade la cabecera +/// `Location` y la cierra con `.finish()`, evitando repetir la misma secuencia en cada controlador. pub struct Redirect; impl Redirect { @@ -34,12 +34,10 @@ impl Redirect { /// Emplear cuando un recurso se ha movido de forma definitiva y la URL antigua debe dejar de /// usarse. #[must_use] - pub fn moved(redirect_to_url: &str) -> Response { - ( - http::StatusCode::MOVED_PERMANENTLY, - [(http::header::LOCATION, redirect_to_url.to_owned())], - ) - .into_response() + pub fn moved(redirect_to_url: &str) -> HttpResponse { + HttpResponse::MovedPermanently() + .append_header(("Location", redirect_to_url)) + .finish() } /// Redirección **permanente**. Código de estado **308**. Mantiene método y cuerpo sin cambios. @@ -47,12 +45,10 @@ impl Redirect { /// Indicada para reorganizaciones de un sitio o aplicación web en las que también existen /// métodos distintos de GET (POST, PUT, ...) que no deben degradarse a GET. #[must_use] - pub fn permanent(redirect_to_url: &str) -> Response { - ( - http::StatusCode::PERMANENT_REDIRECT, - [(http::header::LOCATION, redirect_to_url.to_owned())], - ) - .into_response() + pub fn permanent(redirect_to_url: &str) -> HttpResponse { + HttpResponse::PermanentRedirect() + .append_header(("Location", redirect_to_url)) + .finish() } /// Redirección **temporal**. Código de estado **302**. El método GET (y normalmente HEAD) se @@ -61,12 +57,10 @@ impl Redirect { /// Útil cuando un recurso está fuera de servicio de forma imprevista (mantenimiento breve, /// sobrecarga, ...). #[must_use] - pub fn found(redirect_to_url: &str) -> Response { - ( - http::StatusCode::FOUND, - [(http::header::LOCATION, redirect_to_url.to_owned())], - ) - .into_response() + pub fn found(redirect_to_url: &str) -> HttpResponse { + HttpResponse::Found() + .append_header(("Location", redirect_to_url)) + .finish() } /// Redirección **temporal**. Código de estado **303**. Método GET se mantiene tal cual. Los @@ -75,12 +69,10 @@ impl Redirect { /// Se usa típicamente tras un POST o PUT para aplicar el patrón *Post/Redirect/Get*, permite /// recargar la página de resultados sin volver a ejecutar la operación. #[must_use] - pub fn see_other(redirect_to_url: &str) -> Response { - ( - http::StatusCode::SEE_OTHER, - [(http::header::LOCATION, redirect_to_url.to_owned())], - ) - .into_response() + pub fn see_other(redirect_to_url: &str) -> HttpResponse { + HttpResponse::SeeOther() + .append_header(("Location", redirect_to_url)) + .finish() } /// Redirección **temporal**. Código de estado **307**. Conserva método y cuerpo íntegros. @@ -88,12 +80,10 @@ impl Redirect { /// Preferible a [`found`](Self::found) cuando el sitio expone operaciones diferentes de GET que /// deben respetarse durante la redirección. #[must_use] - pub fn temporary(redirect_to_url: &str) -> Response { - ( - http::StatusCode::TEMPORARY_REDIRECT, - [(http::header::LOCATION, redirect_to_url.to_owned())], - ) - .into_response() + pub fn temporary(redirect_to_url: &str) -> HttpResponse { + HttpResponse::TemporaryRedirect() + .append_header(("Location", redirect_to_url)) + .finish() } /// Respuesta **especial**. Código de estado **304**. Se envía tras una petición condicional, @@ -102,7 +92,7 @@ impl Redirect { /// /// No es una redirección, el cliente debe reutilizar su copia local. #[must_use] - pub fn not_modified() -> Response { - http::StatusCode::NOT_MODIFIED.into_response() + pub fn not_modified() -> HttpResponse { + HttpResponse::NotModified().finish() } } diff --git a/src/service.rs b/src/service.rs new file mode 100644 index 00000000..10665413 --- /dev/null +++ b/src/service.rs @@ -0,0 +1,128 @@ +//! Gestión del servidor y servicios web (con [Actix Web](https://docs.rs/actix-web)). + +pub use actix_session::Session; +pub use actix_web::body::BoxBody; +pub use actix_web::dev::Server; +pub use actix_web::dev::ServiceFactory as Factory; +pub use actix_web::dev::ServiceRequest as Request; +pub use actix_web::dev::ServiceResponse as Response; +pub use actix_web::{cookie, http, rt, web}; +pub use actix_web::{App, Error, HttpMessage, HttpRequest, HttpResponse, HttpServer}; +pub use actix_web_files::Files as ActixFiles; + +pub use pagetop_statics::ResourceFiles; + +#[doc(hidden)] +pub use actix_web::test; + +// **< static_files_service! >********************************************************************** + +/// Configura un servicio web para publicar archivos estáticos. +/// +/// La macro ofrece tres modos para configurar el servicio: +/// +/// - **Sistema de ficheros o embebido** (`[$path, $bundle]`): trata de servir los archivos desde +/// `$path`; y si es una cadena vacía, no existe o no es un directorio, entonces usará el conjunto +/// de recursos `$bundle` integrado en el binario. +/// - **Sólo embebido** (`[$bundle]`): sirve siempre desde el conjunto de recursos `$bundle` +/// integrado en el binario. +/// - **Sólo sistema de ficheros** (`$path`): sin usar corchetes, sirve únicamente desde el sistema +/// de ficheros si existe; en otro caso no registra el servicio. +/// +/// # Argumentos +/// +/// * `$scfg` - Instancia de [`ServiceConfig`](crate::service::web::ServiceConfig) donde aplicar la +/// configuración. +/// * `$path` - Ruta al directorio local con los archivos estáticos. +/// * `$bundle` - Nombre del conjunto de recursos que esta macro integra en el binario. +/// * `$route` - Ruta URL base desde la que se servirán los archivos. +/// +/// # Ejemplos +/// +/// ```rust,ignore +/// # use pagetop::prelude::*; +/// pub struct MyExtension; +/// +/// impl Extension for MyExtension { +/// fn configure_service(&self, scfg: &mut service::web::ServiceConfig) { +/// // Forma 1) Sistema de ficheros o embebido. +/// static_files_service!(scfg, ["/var/www/static", assets] => "/public"); +/// +/// // Forma 2) Siempre embebido. +/// static_files_service!(scfg, [assets] => "/public"); +/// +/// // Forma 3) Sólo sistema de ficheros (no requiere `assets`). +/// static_files_service!(scfg, "/var/www/static" => "/public"); +/// } +/// } +/// ``` +#[macro_export] +macro_rules! static_files_service { + // Forma 1: primero intenta servir desde el sistema de ficheros; si falla, sirve embebido. + ( $scfg:ident, [$path:expr, $bundle:ident] => $route:expr $(,)? ) => {{ + let span = $crate::trace::debug_span!( + "Configuring static files (file system or embedded)", + mode = "fs_or_embedded", + route = $route, + ); + let _ = span.in_scope(|| { + let mut serve_embedded: bool = true; + if !::std::path::Path::new(&$path).as_os_str().is_empty() { + if let Ok(absolute) = $crate::util::resolve_absolute_dir($path) { + $scfg.service($crate::service::ActixFiles::new($route, absolute)); + serve_embedded = false; + } + } + if serve_embedded { + $crate::util::paste! { + mod [] { + include!(concat!(env!("OUT_DIR"), "/", stringify!($bundle), ".rs")); + } + $scfg.service($crate::service::ResourceFiles::new( + $route, + []::$bundle(), + )); + } + } + }); + }}; + // Forma 2: sirve siempre embebido. + ( $scfg:ident, [$bundle:ident] => $route:expr $(,)? ) => {{ + let span = $crate::trace::debug_span!( + "Configuring static files (using embedded only)", + mode = "embedded", + route = $route, + ); + let _ = span.in_scope(|| { + $crate::util::paste! { + mod [] { + include!(concat!(env!("OUT_DIR"), "/", stringify!($bundle), ".rs")); + } + $scfg.service($crate::service::ResourceFiles::new( + $route, + []::$bundle(), + )); + } + }); + }}; + // Forma 3: intenta servir desde el sistema de ficheros. + ( $scfg:ident, $path:expr => $route:expr $(,)? ) => {{ + let span = $crate::trace::debug_span!( + "Configuring static files (file system only)", + mode = "fs", + route = $route, + ); + let _ = span.in_scope(|| match $crate::util::resolve_absolute_dir($path) { + Ok(absolute) => { + $scfg.service($crate::service::ActixFiles::new($route, absolute)); + } + Err(e) => { + $crate::trace::warn!( + "Static dir not found or invalid for route `{}`: {:?} ({e})", + $route, + $path, + ); + } + }); + }}; +} diff --git a/src/util.rs b/src/util.rs index 5c1fff49..6ea4b70d 100644 --- a/src/util.rs +++ b/src/util.rs @@ -58,15 +58,14 @@ pub enum NormalizeAsciiError { /// # use pagetop::util; /// assert_eq!(util::normalize_ascii(" Foo\tBAR CLi\r\n").unwrap().as_ref(), "foo bar cli"); /// ``` -pub fn normalize_ascii(input: &str) -> Result, NormalizeAsciiError> { +pub fn normalize_ascii<'a>(input: &'a str) -> Result, NormalizeAsciiError> { let bytes = input.as_bytes(); if bytes.is_empty() { return Err(NormalizeAsciiError::IsEmpty); } - // Primera pasada, determina si se necesita asignación y calcula los límites del contenido. - let mut start = 0; - let mut end = 0; + let mut start = 0usize; + let mut end = 0usize; let mut needs_alloc = false; let mut needs_alloc_ws = false; @@ -111,7 +110,6 @@ pub fn normalize_ascii(input: &str) -> Result, NormalizeAsciiError> return Ok(Cow::Borrowed(slice)); } - // Segunda pasada, construye la cadena normalizada. let mut output = String::with_capacity(slice.len()); let mut prev_sep = true; @@ -134,8 +132,8 @@ pub fn normalize_ascii(input: &str) -> Result, NormalizeAsciiError> /// /// - Devuelve `Some(Cow)` si la entrada es válida ASCII (normalizada a minúsculas). /// - Devuelve `Some(Cow::Borrowed(""))` si la entrada es `""` o queda vacía tras recortar. -/// - Devuelve `None` si la entrada contiene bytes no ASCII; y emite un `trace::debug!` con el campo -/// `target`. +/// - Devuelve `None` si la entrada contiene bytes non-ASCII; y emite un `trace::debug!` con el +/// campo `target`. #[inline] pub fn normalize_ascii_or_empty<'a>(input: &'a str, target: &'static str) -> Option> { match normalize_ascii(input) { @@ -173,25 +171,15 @@ pub fn normalize_ascii_or_empty<'a>(input: &'a str, target: &'static str) -> Opt /// println!("{:#?}", util::resolve_absolute_dir("/var/www")); /// ``` pub fn resolve_absolute_dir>(path: P) -> io::Result { - resolve_absolute_dir_with_base(path, env::var_os("CARGO_MANIFEST_DIR").map(PathBuf::from)) -} - -/// Auxiliar de [`resolve_absolute_dir`] expuesta para tests. -/// -/// Permite probar la lógica de resolución inyectando el directorio base explícitamente, sin -/// modificar variables de entorno globales. No forma parte de la API pública. -#[doc(hidden)] -pub fn resolve_absolute_dir_with_base>( - path: P, - base: Option, -) -> io::Result { let path = path.as_ref(); let candidate = if path.is_absolute() { path.to_path_buf() } else { - // Directorio base proporcionado, o current_dir() en su defecto. - base.or_else(|| env::current_dir().ok()) + // Directorio base CARGO_MANIFEST_DIR si está disponible; o current_dir() en su defecto. + env::var_os("CARGO_MANIFEST_DIR") + .map(PathBuf::from) + .or_else(|| env::current_dir().ok()) .unwrap_or_else(|| PathBuf::from(".")) .join(path) }; @@ -203,8 +191,10 @@ pub fn resolve_absolute_dir_with_base>( if absolute_dir.is_dir() { Ok(absolute_dir) } else { - let msg = format!("path \"{}\" is not a directory", absolute_dir.display()); - trace::warn!(msg); - Err(io::Error::new(io::ErrorKind::InvalidInput, msg)) + Err({ + let msg = format!("path \"{}\" is not a directory", absolute_dir.display()); + trace::warn!(msg); + io::Error::new(io::ErrorKind::InvalidInput, msg) + }) } } diff --git a/src/web.rs b/src/web.rs deleted file mode 100644 index 787a7828..00000000 --- a/src/web.rs +++ /dev/null @@ -1,352 +0,0 @@ -//! Servidor web y rutas de la aplicación (basado en [Axum](https://docs.rs/axum)). -//! -//! Define rutas y manejadores: el [`Router`], las operaciones HTTP ([`get`], [`post`], [`put`], -//! [`delete`], [`patch`]), los extractores ([`Path`], [`Query`]) e [`IntoResponse`], y re-exporta -//! el módulo `http` para tipos de bajo nivel como `StatusCode`, `HeaderName` o `Method`. También -//! ofrece utilidades para servir archivos estáticos, [`ServeDir`] y [`ServeEmbedded`]. - -use crate::StaticFile; - -use std::collections::HashMap; -use std::convert::Infallible; -use std::task::{Context, Poll}; - -use axum::body::Body; -use axum::extract::FromRequestParts; - -// Infraestructura del router. -pub use axum::Router; -pub use axum::http; - -// Extractores de petición. -pub use axum::extract::{Path, Query}; - -// Para implementar respuestas. -pub use axum::response::{IntoResponse, Response}; - -// Operaciones HTTP para registrar rutas. -pub use axum::routing::{delete, get, patch, post, put}; - -// **< HttpRequest >******************************************************************************** - -/// Representa una petición HTTP. -/// -/// Almacena los datos necesarios para negociar el idioma y renderizar las páginas de error, -/// incluyendo la URI completa y las cabeceras de la petición original. -/// -/// Puede declararse directamente como parámetro en un *handler* para pasarlo al -/// [`Context`](crate::core::component::Context) de renderizado y a las variantes de -/// [`ErrorPage`](crate::response::page::ErrorPage): -/// -/// ```rust,ignore -/// async fn my_handler(request: HttpRequest) -> Result { ... } -/// ``` -#[derive(Clone, Debug)] -pub struct HttpRequest { - uri: http::Uri, - headers: http::HeaderMap, -} - -impl HttpRequest { - /// Devuelve la URI completa de la petición, incluyendo la *query string* si la hay. - pub fn uri(&self) -> &str { - self.uri - .path_and_query() - .map(|pq| pq.as_str()) - .unwrap_or("/") - } - - /// Devuelve la ruta (*path*) de la petición, sin la *query string*. - pub fn path(&self) -> &str { - self.uri.path() - } - - /// Devuelve la cadena de consulta (*query string*) de la petición, sin el carácter `?`. - /// - /// Devuelve una cadena vacía si la petición no tiene *query string*. - pub fn query_string(&self) -> &str { - self.uri.query().unwrap_or("") - } - - /// Devuelve las cabeceras HTTP de la petición. - pub fn headers(&self) -> &http::HeaderMap { - &self.headers - } -} - -impl FromRequestParts for HttpRequest { - type Rejection = Infallible; - - // Implementa el extractor de Axum para poder declarar `HttpRequest` como parámetro. - async fn from_request_parts( - parts: &mut http::request::Parts, - _state: &S, - ) -> Result { - Ok(HttpRequest { - uri: parts.uri.clone(), - headers: parts.headers.clone(), - }) - } -} - -// **< ServeDir >*********************************************************************************** - -// Servicio para archivos estáticos en disco. -pub use tower_http::services::ServeDir; - -// **< ServeEmbedded >****************************************************************************** - -/// Servicio para archivos estáticos embebidos en el binario. -/// -/// Creado por la macro [`serve_static_files!`](crate::serve_static_files) en los modos que incluyen -/// recursos embebidos. Estos recursos se identifican por su ruta relativa sin la barra inicial -/// (p. ej. `"css/style.css"`). Si se solicita la raíz o una ruta que termina en `/`, el servicio -/// devuelve el `index.html` raíz si existe; no busca por subdirectorio. -/// -/// Implementa [`Clone`] para clonar el servicio por petición, pero internamente comparte el mapa de -/// recursos con un [`Arc`](std::sync::Arc) para evitar copias innecesarias. -#[derive(Clone)] -pub struct ServeEmbedded { - files: std::sync::Arc>, -} - -impl ServeEmbedded { - /// Crea un nuevo servicio a partir del mapa de recursos embebidos generado por `build.rs`. - pub fn new(files: HashMap<&'static str, StaticFile>) -> Self { - Self { - files: std::sync::Arc::new(files), - } - } -} - -impl tower::Service> for ServeEmbedded { - type Response = http::Response; - type Error = Infallible; - type Future = std::future::Ready>; - - fn poll_ready(&mut self, _: &mut Context<'_>) -> Poll> { - Poll::Ready(Ok(())) - } - - fn call(&mut self, req: http::Request) -> Self::Future { - use axum::http::header; - - // Axum elimina el prefijo de montaje: la ruta restante puede o no comenzar con '/'. - let path = req.uri().path().trim_start_matches('/'); - - // Busca la ruta exacta; si es raíz o directorio, intenta index.html. - let resource = self.files.get(path).or_else(|| { - if path.is_empty() || path.ends_with('/') { - self.files.get("index.html") - } else { - None - } - }); - - let response = match resource { - Some(r) => http::Response::builder() - .header(header::CONTENT_TYPE, r.mime_type) - .body(Body::from(r.data)) - .unwrap(), - None => http::Response::builder() - .status(http::StatusCode::NOT_FOUND) - .body(Body::empty()) - .unwrap(), - }; - - std::future::ready(Ok(response)) - } -} - -// **< serve_static_files! >************************************************************************ - -/// Configura el servidor web para publicar archivos estáticos. -/// -/// La macro añade rutas al [`Router`] del primer argumento usando uno de los tres modos posibles: -/// -/// - **Sistema de ficheros o embebido** (`[$dir, $bundle]`): intenta servir los archivos desde el -/// directorio `$dir`; si está vacío, no existe o no es un directorio, usa el conjunto de recursos -/// `$bundle` embebido. -/// - **Sólo embebido** (`[$bundle]`): sirve siempre desde el conjunto de recursos embebido en el -/// binario. -/// - **Sólo sistema de ficheros** (`$dir`): sin corchetes, sirve únicamente desde el directorio si -/// existe. -/// -/// # Argumentos -/// -/// * `$router` - Variable de tipo [`Router`] donde registrar las rutas. -/// * `$dir` - Ruta al directorio local con los archivos estáticos. -/// * `$bundle` - Nombre del conjunto de recursos embebidos generado por `build.rs`. -/// * `$path` - Prefijo URL bajo el que se publicarán los archivos. -/// -/// # Ejemplos -/// -/// ```rust,ignore -/// # use pagetop::prelude::*; -/// pub struct MyExtension; -/// -/// impl Extension for MyExtension { -/// fn configure_router(&self, router: Router) -> Router { -/// // Forma 1) Sistema de ficheros o embebido. -/// serve_static_files!(router, ["/var/www/static", assets] => "/public"); -/// -/// // Forma 2) Siempre embebido. -/// serve_static_files!(router, [assets] => "/public"); -/// -/// // Forma 3) Sólo sistema de ficheros (no requiere `assets`). -/// serve_static_files!(router, "/var/www/static" => "/public"); -/// -/// router -/// } -/// } -/// ``` -#[macro_export] -macro_rules! serve_static_files { - // Forma 1: primero intenta servir desde el sistema de ficheros; si falla, sirve embebido. - ( $router:ident, [$dir:expr, $bundle:ident] => $path:expr $(,)? ) => { - let $router = { - let _span = $crate::trace::debug_span!( - "serve_static_files", - mode = "filesystem_or_embedded", - route = $path, - ) - .entered(); - let mut __r = $router; - let mut served_from_fs = false; - if !::std::path::Path::new(&$dir).as_os_str().is_empty() { - if let Ok(absolute) = $crate::util::resolve_absolute_dir($dir) { - __r = __r.nest_service($path, $crate::web::ServeDir::new(absolute)); - served_from_fs = true; - } - } - if !served_from_fs { - $crate::util::paste! { - mod [] { - include!(concat!(env!("OUT_DIR"), "/", stringify!($bundle), ".rs")); - } - __r = __r.nest_service( - $path, - $crate::web::ServeEmbedded::new( - []::$bundle(), - ), - ); - } - } - __r - }; - }; - // Forma 2: sirve siempre embebido. - ( $router:ident, [$bundle:ident] => $path:expr $(,)? ) => { - let $router = { - let _span = $crate::trace::debug_span!( - "serve_static_files", - mode = "embedded_only", - route = $path, - ) - .entered(); - $crate::util::paste! { - mod [] { - include!(concat!(env!("OUT_DIR"), "/", stringify!($bundle), ".rs")); - } - $router.nest_service( - $path, - $crate::web::ServeEmbedded::new( - []::$bundle(), - ), - ) - } - }; - }; - // Forma 3: intenta servir desde el sistema de ficheros. - ( $router:ident, $dir:expr => $path:expr $(,)? ) => { - let $router = { - let _span = $crate::trace::debug_span!( - "serve_static_files", - mode = "filesystem_only", - route = $path, - ) - .entered(); - match $crate::util::resolve_absolute_dir($dir) { - Ok(absolute) => $router.nest_service($path, $crate::web::ServeDir::new(absolute)), - Err(e) => { - $crate::trace::warn!( - "Static dir not found or invalid for route `{}`: {} ({e})", - $path, - $dir, - ); - $router - } - } - }; - }; -} - -// **< Utilidades de test >************************************************************************* - -/// Utilidades para escribir pruebas de integración con PageTop sobre Axum. -#[doc(hidden)] -pub mod test { - use axum::Router; - use axum::body::Body; - use axum::http; - use tower::ServiceExt; - - /// Devuelve el router tal como se recibe, listo para usarse en pruebas de integración. - pub fn init_router(router: Router) -> Router { - router - } - - /// Constructor de peticiones HTTP para pruebas. - pub struct TestRequest { - method: http::Method, - uri: String, - } - - impl TestRequest { - /// Crea una petición GET. - pub fn get() -> Self { - Self { - method: http::Method::GET, - uri: "/".to_owned(), - } - } - - /// Crea una petición POST. - pub fn post() -> Self { - Self { - method: http::Method::POST, - uri: "/".to_owned(), - } - } - - /// Establece la URI de la petición. - pub fn uri(mut self, uri: impl Into) -> Self { - self.uri = uri.into(); - self - } - - /// Construye la petición HTTP de Axum (para enviar al router en tests de integración). - pub fn to_request(self) -> http::Request { - http::Request::builder() - .method(self.method) - .uri(self.uri) - .body(Body::empty()) - .unwrap() - } - - /// Construye un [`HttpRequest`](super::HttpRequest) listo para pasarlo a - /// [`Context::new`](crate::core::component::Context::new) en tests unitarios de componentes. - pub fn to_http_request(self) -> super::HttpRequest { - let uri = self.uri.parse().unwrap(); - super::HttpRequest { - uri, - headers: axum::http::HeaderMap::new(), - } - } - } - - /// Envía una petición al router y devuelve la respuesta. - pub async fn send_request(router: &Router, req: http::Request) -> http::Response { - router.clone().oneshot(req).await.unwrap() - } -} diff --git a/static/css/intro.css b/static/css/intro.css index 00fe0d21..1cc03ffc 100644 --- a/static/css/intro.css +++ b/static/css/intro.css @@ -1,8 +1,8 @@ :root { - --intro-bg-img: url('/pagetop/img/intro-header.jpg'); - --intro-bg-img-set: image-set(url('/pagetop/img/intro-header.avif') type('image/avif'), url('/pagetop/img/intro-header.webp') type('image/webp'), var(--intro-bg-img) type('image/jpeg')); - --intro-bg-img-sm: url('/pagetop/img/intro-header-sm.jpg'); - --intro-bg-img-sm-set: image-set(url('/pagetop/img/intro-header-sm.avif') type('image/avif'), url('/pagetop/img/intro-header-sm.webp') type('image/webp'), var(--intro-bg-img-sm) type('image/jpeg')); + --intro-bg-img: url('/img/intro-header.jpg'); + --intro-bg-img-set: image-set(url('/img/intro-header.avif') type('image/avif'), url('/img/intro-header.webp') type('image/webp'), var(--intro-bg-img) type('image/jpeg')); + --intro-bg-img-sm: url('/img/intro-header-sm.jpg'); + --intro-bg-img-sm-set: image-set(url('/img/intro-header-sm.avif') type('image/avif'), url('/img/intro-header-sm.webp') type('image/webp'), var(--intro-bg-img-sm) type('image/jpeg')); --intro-bg-color: #7a430e; --intro-bg-block-1: #ffb84b; --intro-bg-block-2: #ffc66f; diff --git a/tests/component_html.rs b/tests/component_html.rs index d805d079..06d77ec9 100644 --- a/tests/component_html.rs +++ b/tests/component_html.rs @@ -46,20 +46,18 @@ async fn component_html_default_renders_empty_markup() { } #[pagetop::test] -async fn component_html_can_access_request_path() { - let req = web::test::TestRequest::get() - .uri("/hello/world") - .to_http_request(); +async fn component_html_can_access_http_method() { + let req = service::test::TestRequest::with_uri("/").to_http_request(); let mut cx = Context::new(Some(req)); let mut component = Html::with(|cx| { - let path = cx + let method = cx .request() - .map(|r| r.path().to_string()) + .map(|r| r.method().to_string()) .unwrap_or_default(); - html! { span { (path) } } + html! { span { (method) } } }); let markup = component.render(&mut cx); - assert_eq!(markup.0, "/hello/world"); + assert_eq!(markup.0, "GET"); } diff --git a/tests/component_poweredby.rs b/tests/component_poweredby.rs index 89ff3269..7dca895d 100644 --- a/tests/component_poweredby.rs +++ b/tests/component_poweredby.rs @@ -1,16 +1,8 @@ use pagetop::prelude::*; -/// Inicializa PageTop (locale, extensiones...) una sola vez para toda la suite. -/// -/// Los tests de este módulo renderizan componentes directamente con `Context::default()`, por lo -/// que sólo necesitan el subsistema de localización y las extensiones registradas, no un router. -fn setup() { - let _ = Application::new(); -} - #[pagetop::test] async fn poweredby_default_shows_only_pagetop_recognition() { - setup(); + let _app = service::test::init_service(Application::new().test()).await; let mut p = PoweredBy::default(); let html = p.render(&mut Context::default()); @@ -24,7 +16,7 @@ async fn poweredby_default_shows_only_pagetop_recognition() { #[pagetop::test] async fn poweredby_new_includes_current_year_and_app_name() { - setup(); + let _app = service::test::init_service(Application::new().test()).await; let mut p = PoweredBy::new(); let html = p.render(&mut Context::default()); @@ -48,7 +40,7 @@ async fn poweredby_new_includes_current_year_and_app_name() { #[pagetop::test] async fn poweredby_with_copyright_overrides_text() { - setup(); + let _app = service::test::init_service(Application::new().test()).await; let custom = "2001 © FooBar Inc."; let mut p = PoweredBy::default().with_copyright(Some(custom)); @@ -60,7 +52,7 @@ async fn poweredby_with_copyright_overrides_text() { #[pagetop::test] async fn poweredby_with_copyright_none_hides_text() { - setup(); + let _app = service::test::init_service(Application::new().test()).await; let mut p = PoweredBy::new().with_copyright(None::); let html = p.render(&mut Context::default()); @@ -72,7 +64,7 @@ async fn poweredby_with_copyright_none_hides_text() { #[pagetop::test] async fn poweredby_link_points_to_crates_io() { - setup(); + let _app = service::test::init_service(Application::new().test()).await; let mut p = PoweredBy::default(); let html = p.render(&mut Context::default()); @@ -85,7 +77,7 @@ async fn poweredby_link_points_to_crates_io() { #[pagetop::test] async fn poweredby_getter_reflects_internal_state() { - setup(); + let _app = service::test::init_service(Application::new().test()).await; // Por defecto no hay copyright. let p0 = PoweredBy::default(); diff --git a/tests/config.rs b/tests/config.rs index 91fc8419..ff7135c0 100644 --- a/tests/config.rs +++ b/tests/config.rs @@ -2,6 +2,8 @@ use pagetop::prelude::*; use serde::Deserialize; +use std::env; + include_config!(SETTINGS: Settings => [ "test.string_value" => "Test String", "test.int_value" => -321, @@ -20,12 +22,10 @@ pub struct Test { pub float_value: f32, } -// La *feature* `testing` (activo con `cargo ts` / `cargo tw`) fija el modo "test" en tiempo de -// compilación dentro de `config::CONFIG_VALUES`, de forma que `global::SETTINGS` y cualquier -// `include_config!` local cargan automáticamente la configuración del modo "test". - #[pagetop::test] async fn check_global_config() { + env::set_var("PAGETOP_RUN_MODE", "test"); + assert_eq!(global::SETTINGS.app.run_mode, "test"); assert_eq!(global::SETTINGS.app.name, "Testing"); assert_eq!(global::SETTINGS.server.bind_port, 9000); @@ -33,6 +33,8 @@ async fn check_global_config() { #[pagetop::test] async fn check_local_config() { + env::set_var("PAGETOP_RUN_MODE", "test"); + assert_eq!(SETTINGS.test.string_value, "Modified value"); assert_eq!(SETTINGS.test.int_value, -321); assert_eq!(SETTINGS.test.float_value, 8.7654); diff --git a/tests/html_classes.rs b/tests/html_classes.rs index e2198335..91eaaad7 100644 --- a/tests/html_classes.rs +++ b/tests/html_classes.rs @@ -79,19 +79,19 @@ async fn classes_prepend_ignores_empty_input() { } #[pagetop::test] -async fn classes_reset_replaces_entire_list_and_dedups() { - let c = Classes::new("a b c").with_classes(ClassesOp::Reset, "X y y Z"); +async fn classes_set_replaces_entire_list_and_dedups() { + let c = Classes::new("a b c").with_classes(ClassesOp::Set, "X y y Z"); assert_classes(&c, Some("x y z")); } #[pagetop::test] -async fn classes_reset_with_empty_input_clears() { +async fn classes_set_with_empty_input_clears() { let base = Classes::new("a b"); - let c = base.with_classes(ClassesOp::Reset, " \n "); + let c = base.with_classes(ClassesOp::Set, " \n "); assert_classes(&c, None); } -// **< Mutation operations (remove/toggle) >******************************************************** +// **< Mutation operations (remove/toggle/replace) >************************************************ #[pagetop::test] async fn classes_remove_is_case_insensitive() { @@ -138,6 +138,49 @@ async fn classes_toggle_duplicate_tokens_are_applied_sequentially() { assert_classes(&c, Some("b a")); } +#[pagetop::test] +async fn classes_replace_removes_targets_and_inserts_new_at_min_position() { + let c = Classes::new("a b c d").with_classes(ClassesOp::Replace("c a".into()), "x y"); + assert_classes(&c, Some("x y b d")); +} + +#[pagetop::test] +async fn classes_replace_when_none_found_does_nothing() { + let c = Classes::new("a b").with_classes(ClassesOp::Replace("x y".into()), "c d"); + assert_classes(&c, Some("a b")); +} + +#[pagetop::test] +async fn classes_replace_is_case_insensitive_on_targets_and_new_values_are_normalized() { + let c = Classes::new("btn btn-primary active") + .with_classes(ClassesOp::Replace("BTN-PRIMARY".into()), "Btn-Secondary"); + assert_classes(&c, Some("btn btn-secondary active")); +} + +#[pagetop::test] +async fn classes_replace_with_empty_new_removes_only() { + let c = Classes::new("a b c").with_classes(ClassesOp::Replace("b".into()), " "); + assert_classes(&c, Some("a c")); +} + +#[pagetop::test] +async fn classes_replace_dedups_against_existing_items() { + let c = Classes::new("a b c").with_classes(ClassesOp::Replace("b".into()), "c d"); + assert_classes(&c, Some("a d c")); +} + +#[pagetop::test] +async fn classes_replace_ignores_target_whitespace_and_repetition() { + let c = Classes::new("a b c").with_classes(ClassesOp::Replace(" b b ".into()), "x y"); + assert_classes(&c, Some("a x y c")); +} + +#[pagetop::test] +async fn classes_replace_rejects_non_ascii_targets_is_noop() { + let c = Classes::new("a b c").with_classes(ClassesOp::Replace("b ñ".into()), "x"); + assert_classes(&c, Some("a b c")); +} + // **< Queries (contains) >************************************************************************* #[pagetop::test] diff --git a/tests/locale.rs b/tests/locale.rs index 51ff1863..e15d4f75 100644 --- a/tests/locale.rs +++ b/tests/locale.rs @@ -2,7 +2,7 @@ use pagetop::prelude::*; #[pagetop::test] async fn literal_text() { - let _app = web::test::init_router(Application::new().test()); + let _app = service::test::init_service(Application::new().test()).await; let l10n = L10n::n("© 2025 PageTop"); assert_eq!(l10n.get(), Some("© 2025 PageTop".to_string())); @@ -10,7 +10,7 @@ async fn literal_text() { #[pagetop::test] async fn translation_without_args() { - let _app = web::test::init_router(Application::new().test()); + let _app = service::test::init_service(Application::new().test()).await; let l10n = L10n::l("test_hello_world"); let translation = l10n.lookup(&Locale::resolve("es-ES")); @@ -19,7 +19,7 @@ async fn translation_without_args() { #[pagetop::test] async fn translation_with_args() { - let _app = web::test::init_router(Application::new().test()); + let _app = service::test::init_service(Application::new().test()).await; let l10n = L10n::l("test_hello_user").with_arg("userName", "Manuel"); let translation = l10n.lookup(&Locale::resolve("es-ES")); @@ -28,7 +28,7 @@ async fn translation_with_args() { #[pagetop::test] async fn translation_with_plural_and_select() { - let _app = web::test::init_router(Application::new().test()); + let _app = service::test::init_service(Application::new().test()).await; let l10n = L10n::l("test_shared_photos").with_args(vec![ ("userName", "Roberto"), @@ -41,7 +41,7 @@ async fn translation_with_plural_and_select() { #[pagetop::test] async fn check_fallback_language() { - let _app = web::test::init_router(Application::new().test()); + let _app = service::test::init_service(Application::new().test()).await; let l10n = L10n::l("test_hello_world"); let translation = l10n.lookup(&Locale::resolve("xx-YY")); // Retrocede a "en-US". @@ -50,7 +50,7 @@ async fn check_fallback_language() { #[pagetop::test] async fn check_unknown_key() { - let _app = web::test::init_router(Application::new().test()); + let _app = service::test::init_service(Application::new().test()).await; let l10n = L10n::l("non-existent-key"); let translation = l10n.lookup(&Locale::resolve("en-US")); diff --git a/tests/service.rs b/tests/service.rs index 5f2ca87b..5aec398e 100644 --- a/tests/service.rs +++ b/tests/service.rs @@ -2,11 +2,11 @@ use pagetop::prelude::*; #[pagetop::test] async fn homepage_returns_404() { - let app = web::test::init_router(Application::new().test()); + let app = service::test::init_service(Application::new().test()).await; - let req = web::test::TestRequest::get().uri("/").to_request(); - let resp = web::test::send_request(&app, req).await; + let req = service::test::TestRequest::get().uri("/").to_request(); + let resp = service::test::call_service(&app, req).await; // Comprueba el acceso a la ruta de inicio. - assert_eq!(resp.status(), web::http::StatusCode::OK); + assert_eq!(resp.status(), service::http::StatusCode::OK); } diff --git a/tests/util.rs b/tests/util.rs index 6dafce8a..d7d8dd65 100644 --- a/tests/util.rs +++ b/tests/util.rs @@ -1,6 +1,6 @@ use pagetop::prelude::*; -use std::{borrow::Cow, fs, io}; +use std::{borrow::Cow, env, fs, io}; use tempfile::TempDir; // **< Testing normalize_ascii() >****************************************************************** @@ -265,7 +265,7 @@ mod unix { #[pagetop::test] async fn ok_absolute_dir() -> io::Result<()> { - let _app = web::test::init_router(Application::new().test()); + let _app = service::test::init_service(Application::new().test()).await; // /tmp//sub let td = TempDir::new()?; @@ -279,13 +279,21 @@ mod unix { #[pagetop::test] async fn ok_relative_dir_with_manifest() -> io::Result<()> { - let _app = web::test::init_router(Application::new().test()); + let _app = service::test::init_service(Application::new().test()).await; let td = TempDir::new()?; let sub = td.path().join("sub"); fs::create_dir(&sub)?; - let res = util::resolve_absolute_dir_with_base("sub", Some(td.path().to_path_buf())); + // Fija CARGO_MANIFEST_DIR para que "sub" se resuelva contra td.path() + let prev_manifest_dir = env::var_os("CARGO_MANIFEST_DIR"); + env::set_var("CARGO_MANIFEST_DIR", td.path()); + let res = util::resolve_absolute_dir("sub"); + // Restaura entorno. + match prev_manifest_dir { + Some(v) => env::set_var("CARGO_MANIFEST_DIR", v), + None => env::remove_var("CARGO_MANIFEST_DIR"), + } assert_eq!(res?, std::fs::canonicalize(&sub)?); Ok(()) @@ -293,7 +301,7 @@ mod unix { #[pagetop::test] async fn error_not_a_directory() -> io::Result<()> { - let _app = web::test::init_router(Application::new().test()); + let _app = service::test::init_service(Application::new().test()).await; let td = TempDir::new()?; let file = td.path().join("foo.txt"); @@ -311,7 +319,7 @@ mod windows { #[pagetop::test] async fn ok_absolute_dir() -> io::Result<()> { - let _app = web::test::init_router(Application::new().test()); + let _app = service::test::init_service(Application::new().test()).await; // C:\Users\...\Temp\... let td = TempDir::new()?; @@ -325,13 +333,21 @@ mod windows { #[pagetop::test] async fn ok_relative_dir_with_manifest() -> io::Result<()> { - let _app = web::test::init_router(Application::new().test()); + let _app = service::test::init_service(Application::new().test()).await; let td = TempDir::new()?; let sub = td.path().join("sub"); fs::create_dir(&sub)?; - let res = resolve_absolute_dir_with_base("sub", Some(td.path().to_path_buf())); + // Fija CARGO_MANIFEST_DIR para que "sub" se resuelva contra td.path() + let prev_manifest_dir = env::var_os("CARGO_MANIFEST_DIR"); + env::set_var("CARGO_MANIFEST_DIR", td.path()); + let res = util::resolve_absolute_dir("sub"); + // Restaura entorno. + match prev_manifest_dir { + Some(v) => env::set_var("CARGO_MANIFEST_DIR", v), + None => env::remove_var("CARGO_MANIFEST_DIR"), + } assert_eq!(res?, std::fs::canonicalize(&sub)?); Ok(()) @@ -339,7 +355,7 @@ mod windows { #[pagetop::test] async fn error_not_a_directory() -> io::Result<()> { - let _app = web::test::init_router(Application::new().test()); + let _app = service::test::init_service(Application::new().test()).await; let td = TempDir::new()?; let file = td.path().join("foo.txt"); diff --git a/tools/changelog.sh b/tools/changelog.sh index fc2a8a0c..36fd8f9b 100755 --- a/tools/changelog.sh +++ b/tools/changelog.sh @@ -65,7 +65,6 @@ case "$CRATE" in # Extensions --exclude-path "extensions/pagetop-aliner/**/*" --exclude-path "extensions/pagetop-bootsier/**/*" - --exclude-path "extensions/pagetop-seaorm/**/*" ) ;; pagetop-aliner) @@ -76,10 +75,6 @@ case "$CRATE" in CHANGELOG_FILE="extensions/pagetop-bootsier/CHANGELOG.md" PATH_FLAGS=(--include-path "extensions/pagetop-bootsier/**/*") ;; - pagetop-seaorm) - CHANGELOG_FILE="extensions/pagetop-seaorm/CHANGELOG.md" - PATH_FLAGS=(--include-path "extensions/pagetop-seaorm/**/*") - ;; *) echo "Error: unsupported crate '$CRATE'" >&2 exit 1 @@ -125,9 +120,7 @@ read -r -p "Do you want to proceed with the release of $CRATE? [y/N] " REPLY echo "" if [[ ! "$REPLY" =~ ^[Yy]$ ]]; then echo "Aborting release process." >&2 - if [[ -n "${PAGETOP_RESTORE_TREE:-}" ]]; then - git restore --worktree -- . - fi + git restore --worktree -- . exit 1 fi diff --git a/tools/release.sh b/tools/release.sh index 5234c849..92257b32 100755 --- a/tools/release.sh +++ b/tools/release.sh @@ -43,8 +43,6 @@ cd "$(dirname "$0")/.." || exit 1 # ------------------------------------------------------------------------------ # DRY-RUN (por defecto) o ejecución real con --execute # ------------------------------------------------------------------------------ -export PAGETOP_RESTORE_TREE=1 - if [[ "$EXECUTE" != "--execute" ]]; then echo "Running dry-run (default mode). Add --execute to publish" cargo release --config "$CONFIG" --package "$CRATE" "$LEVEL"