diff --git a/Cargo.lock b/Cargo.lock index 7447d0d..4ff50ae 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -94,6 +94,12 @@ version = "0.21.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9" +[[package]] +name = "beef" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a8241f3ebb85c056b509d4327ad0358fbbba6ffb340bf388f26350aeda225b1" + [[package]] name = "bit_field" version = "0.10.2" @@ -185,6 +191,12 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" +[[package]] +name = "countme" +version = "3.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7704b5fdd17b18ae31c4c1da5a2e0305a2bf17b5249300a9ee9ed7b72114c636" + [[package]] name = "crc32fast" version = "1.3.2" @@ -194,6 +206,28 @@ dependencies = [ "cfg-if", ] +[[package]] +name = "crossbeam" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1137cd7e7fc0fb5d3c5a8678be38ec56e819125d8d7907411fe24ccb943faca8" +dependencies = [ + "crossbeam-channel", + "crossbeam-deque", + "crossbeam-epoch", + "crossbeam-queue", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-channel" +version = "0.5.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2" +dependencies = [ + "crossbeam-utils", +] + [[package]] name = "crossbeam-deque" version = "0.8.4" @@ -216,6 +250,15 @@ dependencies = [ "crossbeam-utils", ] +[[package]] +name = "crossbeam-queue" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df0346b5d5e76ac2fe4e327c5fd1118d6be7c51dfb18f9b7922923f287471e35" +dependencies = [ + "crossbeam-utils", +] + [[package]] name = "crossbeam-utils" version = "0.8.18" @@ -231,6 +274,62 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" +[[package]] +name = "csscolorparser" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb2a7d3066da2de787b7f032c736763eb7ae5d355f81a68bab2675a96008b0bf" +dependencies = [ + "phf", +] + +[[package]] +name = "darling" +version = "0.20.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54e36fcd13ed84ffdfda6f5be89b31287cbb80c439841fe69e04841435464391" +dependencies = [ + "darling_core", + "darling_macro", +] + +[[package]] +name = "darling_core" +version = "0.20.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c2cf1c23a687a1feeb728783b993c4e1ad83d99f351801977dd809b48d0a70f" +dependencies = [ + "fnv", + "ident_case", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "darling_macro" +version = "0.20.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f" +dependencies = [ + "darling_core", + "quote", + "syn", +] + +[[package]] +name = "dashmap" +version = "5.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" +dependencies = [ + "cfg-if", + "hashbrown", + "lock_api", + "once_cell", + "parking_lot_core", +] + [[package]] name = "deranged" version = "0.3.11" @@ -261,12 +360,51 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "drop_bomb" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9bda8e21c04aca2ae33ffc2fd8c23134f3cac46db123ba97bd9d3f3b8a4a85e1" + +[[package]] +name = "ego-tree" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a68a4904193147e0a8dec3314640e6db742afd5f6e634f428a6af230d9b3591" + [[package]] name = "either" version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" +[[package]] +name = "enumset" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "226c0da7462c13fb57e5cc9e0dc8f0635e7d27f276a3a7fd30054647f669007d" +dependencies = [ + "enumset_derive", +] + +[[package]] +name = "enumset_derive" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e08b6c6ab82d70f08844964ba10c7babb716de2ecaeab9be5717918a5177d3af" +dependencies = [ + "darling", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "equivalent" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + [[package]] name = "eval" version = "0.1.0" @@ -302,6 +440,12 @@ dependencies = [ "simd-adler32", ] +[[package]] +name = "fixedbitset" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" + [[package]] name = "flate2" version = "1.0.28" @@ -321,6 +465,12 @@ dependencies = [ "spin", ] +[[package]] +name = "fnv" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" + [[package]] name = "getrandom" version = "0.2.12" @@ -351,12 +501,30 @@ dependencies = [ "crunchy", ] +[[package]] +name = "hashbrown" +version = "0.14.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" + [[package]] name = "heck" version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" +[[package]] +name = "hermit-abi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" + +[[package]] +name = "ident_case" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" + [[package]] name = "image" version = "0.24.7" @@ -376,6 +544,22 @@ dependencies = [ "tiff", ] +[[package]] +name = "indexmap" +version = "2.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" +dependencies = [ + "equivalent", + "hashbrown", +] + +[[package]] +name = "indoc" +version = "2.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b248f5224d1d606005e02c97f5aa4e88eeb230488bcc03bc9ca4d7991399f2b5" + [[package]] name = "ir" version = "0.1.0" @@ -385,6 +569,23 @@ dependencies = [ "serde", ] +[[package]] +name = "is-terminal" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f23ff5ef2b80d608d61efee834934d862cd92461afc0560dedf493e4c033738b" +dependencies = [ + "hermit-abi", + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "is_ci" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "616cde7c720bb2bb5824a224687d8f77bfd38922027f01d825cd7453be5099fb" + [[package]] name = "itoa" version = "1.0.10" @@ -400,6 +601,32 @@ dependencies = [ "rayon", ] +[[package]] +name = "lang" +version = "0.1.0" +dependencies = [ + "ariadne", + "clap", + "crossbeam", + "dashmap", + "drop_bomb", + "ego-tree", + "enumset", + "indexmap", + "indoc", + "logos", + "owo-colors", + "petgraph", + "rowan", + "strip-ansi-escapes", +] + +[[package]] +name = "lazy_static" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + [[package]] name = "lebe" version = "0.5.2" @@ -408,9 +635,9 @@ checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8" [[package]] name = "libc" -version = "0.2.152" +version = "0.2.155" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13e3bf6590cbc649f4d1a3eefc9d5d6eb746f5200ffb04e5e142700b8faa56e7" +checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" [[package]] name = "libredox" @@ -420,7 +647,7 @@ checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8" dependencies = [ "bitflags 2.4.1", "libc", - "redox_syscall", + "redox_syscall 0.4.1", ] [[package]] @@ -433,6 +660,54 @@ dependencies = [ "scopeguard", ] +[[package]] +name = "logos" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "161971eb88a0da7ae0c333e1063467c5b5727e7fb6b710b8db4814eade3a42e8" +dependencies = [ + "logos-derive", +] + +[[package]] +name = "logos-codegen" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e31badd9de5131fdf4921f6473d457e3dd85b11b7f091ceb50e4df7c3eeb12a" +dependencies = [ + "beef", + "fnv", + "lazy_static", + "proc-macro2", + "quote", + "regex-syntax", + "syn", +] + +[[package]] +name = "logos-derive" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c2a69b3eb68d5bd595107c9ee58d7e07fe2bb5e360cc85b0f084dedac80de0a" +dependencies = [ + "logos-codegen", +] + +[[package]] +name = "memchr" +version = "2.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" + +[[package]] +name = "memoffset" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" +dependencies = [ + "autocfg", +] + [[package]] name = "miniz_oxide" version = "0.7.1" @@ -482,6 +757,12 @@ dependencies = [ "libc", ] +[[package]] +name = "once_cell" +version = "1.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" + [[package]] name = "option-ext" version = "0.2.0" @@ -493,6 +774,74 @@ name = "owo-colors" version = "4.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "caff54706df99d2a78a5a4e3455ff45448d81ef1bb63c22cd14052ca0e993a3f" +dependencies = [ + "supports-color", +] + +[[package]] +name = "parking_lot_core" +version = "0.9.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall 0.5.1", + "smallvec", + "windows-targets 0.52.0", +] + +[[package]] +name = "petgraph" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9" +dependencies = [ + "fixedbitset", + "indexmap", +] + +[[package]] +name = "phf" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" +dependencies = [ + "phf_macros", + "phf_shared", +] + +[[package]] +name = "phf_generator" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0" +dependencies = [ + "phf_shared", + "rand", +] + +[[package]] +name = "phf_macros" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3444646e286606587e49f3bcf1679b8cef1dc2c5ecc29ddacaffc305180d464b" +dependencies = [ + "phf_generator", + "phf_shared", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "phf_shared" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b" +dependencies = [ + "siphasher", +] [[package]] name = "png" @@ -531,6 +880,16 @@ dependencies = [ "bytemuck", ] +[[package]] +name = "quick-xml" +version = "0.31.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33" +dependencies = [ + "memchr", + "serde", +] + [[package]] name = "quote" version = "1.0.33" @@ -541,10 +900,25 @@ dependencies = [ ] [[package]] -name = "rayon" -version = "1.8.0" +name = "rand" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +dependencies = [ + "rand_core", +] + +[[package]] +name = "rand_core" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" + +[[package]] +name = "rayon" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" dependencies = [ "either", "rayon-core", @@ -552,9 +926,9 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.12.0" +version = "1.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed" +checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" dependencies = [ "crossbeam-deque", "crossbeam-utils", @@ -569,6 +943,15 @@ dependencies = [ "bitflags 1.3.2", ] +[[package]] +name = "redox_syscall" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "469052894dcb553421e483e4209ee581a45100d31b4018de03e5a7ad86374a7e" +dependencies = [ + "bitflags 2.4.1", +] + [[package]] name = "redox_users" version = "0.4.4" @@ -580,6 +963,12 @@ dependencies = [ "thiserror", ] +[[package]] +name = "regex-syntax" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" + [[package]] name = "ron" version = "0.8.1" @@ -592,6 +981,25 @@ dependencies = [ "serde_derive", ] +[[package]] +name = "rowan" +version = "0.15.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32a58fa8a7ccff2aec4f39cc45bf5f985cec7125ab271cf681c279fd00192b49" +dependencies = [ + "countme", + "hashbrown", + "memoffset", + "rustc-hash", + "text-size", +] + +[[package]] +name = "rustc-hash" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" + [[package]] name = "ryu" version = "1.0.16" @@ -641,6 +1049,12 @@ version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" +[[package]] +name = "siphasher" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" + [[package]] name = "smallvec" version = "1.11.2" @@ -656,12 +1070,41 @@ dependencies = [ "lock_api", ] +[[package]] +name = "strip-ansi-escapes" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55ff8ef943b384c414f54aefa961dd2bd853add74ec75e7ac74cf91dba62bcfa" +dependencies = [ + "vte", +] + [[package]] name = "strsim" version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" +[[package]] +name = "supports-color" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6398cde53adc3c4557306a96ce67b302968513830a77a95b2b17305d9719a89" +dependencies = [ + "is-terminal", + "is_ci", +] + +[[package]] +name = "svg-filters" +version = "0.1.0" +dependencies = [ + "csscolorparser", + "indexmap", + "petgraph", + "quick-xml", +] + [[package]] name = "syn" version = "2.0.41" @@ -673,6 +1116,12 @@ dependencies = [ "unicode-ident", ] +[[package]] +name = "text-size" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f18aa187839b2bdb1ad2fa35ead8c4c2976b64e4363c386d45ac0f7ee85c9233" + [[package]] name = "thiserror" version = "1.0.55" @@ -742,6 +1191,26 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" +[[package]] +name = "vte" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f5022b5fbf9407086c180e9557be968742d839e68346af7792b8592489732197" +dependencies = [ + "utf8parse", + "vte_generate_state_changes", +] + +[[package]] +name = "vte_generate_state_changes" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e369bee1b05d510a7b4ed645f5faa90619e05437111783ea5848f28d97d3c2e" +dependencies = [ + "proc-macro2", + "quote", +] + [[package]] name = "wasi" version = "0.11.0+wasi-snapshot-preview1" diff --git a/Cargo.toml b/Cargo.toml index 6d7f53d..2d4a618 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -2,13 +2,16 @@ members = [ "crates/app", "crates/eval", - "crates/ir", + "crates/ir", + "crates/lang", + "crates/svg-filters", ] resolver = "2" [workspace.dependencies] clap = { version = "4", features = ["derive"] } serde = { version = "1.0", features = ["derive"] } +petgraph = "0.6.4" # to enable all the lints below, this must be present in a workspace member's Cargo.toml: # [lints] diff --git a/crates/app/Cargo.toml b/crates/app/Cargo.toml index 2caaaf4..10182c2 100644 --- a/crates/app/Cargo.toml +++ b/crates/app/Cargo.toml @@ -2,6 +2,7 @@ name = "app" version = "0.1.0" edition = "2021" +default-run = "app" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/crates/app/src/config/config_file.rs b/crates/app/src/config/config_file.rs index 15f660c..7078d32 100644 --- a/crates/app/src/config/config_file.rs +++ b/crates/app/src/config/config_file.rs @@ -5,7 +5,9 @@ use std::{ use serde::{Deserialize, Serialize}; -use super::error::Config; +use crate::error_reporting::{report_serde_json_err, report_serde_ron_err}; + +use super::error::{self, Config}; #[derive(Debug, Serialize, Deserialize)] pub struct Configs { @@ -40,14 +42,20 @@ pub(super) fn find_config_file() -> Result { } impl Configs { - pub fn read(p: PathBuf) -> Result { + pub fn read(p: PathBuf) -> Result { match p .extension() .map(|v| v.to_str().expect("config path to be UTF-8")) { - Some("ron") => Ok(serde_json::from_str(&fs::read_to_string(p)?)?), - Some("json") => Ok(ron::from_str(&fs::read_to_string(p)?)?), - e => Err(Config::UnknownExtension(e.map(str::to_owned))), + Some("ron") => { + let f = fs::read_to_string(p)?; + ron::from_str(&f).or_else(|e| report_serde_ron_err(&f, &e)) + } + Some("json") => { + let f = fs::read_to_string(p)?; + serde_json::from_str(&f).or_else(|e| report_serde_json_err(&f, &e)) + } + e => Err(error::Config::UnknownExtension(e.map(str::to_owned))), } } } diff --git a/crates/app/src/error_reporting.rs b/crates/app/src/error_reporting.rs index bc4c44b..3981b17 100644 --- a/crates/app/src/error_reporting.rs +++ b/crates/app/src/error_reporting.rs @@ -25,7 +25,7 @@ fn report_serde_err(src: &str, line: usize, col: usize, msg: String) -> ! { .finish() .eprint(("test", Source::from(src))) .expect("writing error to stderr failed"); - process::exit(1); + process::exit(1) } /// Reconstruct a byte offset from the line + column numbers typical from serde crates diff --git a/crates/lang/Cargo.toml b/crates/lang/Cargo.toml new file mode 100644 index 0000000..c7a2659 --- /dev/null +++ b/crates/lang/Cargo.toml @@ -0,0 +1,25 @@ +[package] +name = "lang" +version = "0.1.0" +edition = "2021" + +# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html + +[dependencies] +logos = "0.14" +petgraph = { workspace = true} +indexmap = "2.2.6" +clap = { version = "4", features = ["derive"] } +ariadne = "0.4.0" +ego-tree = "0.6.2" +rowan = "0.15.15" +drop_bomb = "0.1.5" +enumset = "1.1.3" +indoc = "2" +dashmap = "5.5.3" +crossbeam = "0.8.4" +owo-colors = {version = "4", features = ["supports-colors"]} +strip-ansi-escapes = "0.2.0" + +[lints] +workspace = true diff --git a/crates/lang/src/ast.rs b/crates/lang/src/ast.rs new file mode 100644 index 0000000..d5838a2 --- /dev/null +++ b/crates/lang/src/ast.rs @@ -0,0 +1,80 @@ +use crate::lst_parser::syntax_kind::SyntaxKind::*; +use crate::SyntaxNode; +use rowan::Language; + +// Heavily modified version of https://github.com/rust-analyzer/rowan/blob/e2d2e93e16c5104b136d0bc738a0d48346922200/examples/s_expressions.rs#L250-L266 +macro_rules! ast_nodes { + ($($ast:ident, $kind:ident);+) => { + $( + #[derive(Debug, Clone, PartialEq, Eq, Hash)] + #[repr(transparent)] + pub struct $ast(SyntaxNode); + impl rowan::ast::AstNode for $ast { + type Language = crate::Lang; + + fn can_cast(kind: ::Kind) -> bool { + kind == $kind + } + + fn cast(node: SyntaxNode) -> Option { + if node.kind() == $kind { + Some(Self(node)) + } else { + None + } + } + + fn syntax(&self) -> &SyntaxNode { + &self.0 + } + } + )+ + }; +} + +ast_nodes!( + Def, DEF; + DefName, DEF_NAME; + DefBody, DEF_BODY; + + Mod, MODULE; + ModName, MODULE_NAME; + ModBody, MODULE_BODY; + + Use, USE; + UsePat, USE_PAT; + PatItem, PAT_ITEM; + PatGlob, PAT_GLOB; + PatGroup, PAT_GROUP; + + Literal, LITERAL; + IntLit, INT_NUM; + FloatLit, FLOAT_NUM; + StringLit, STRING; + + Matrix, MATRIX; + MatrixRow, MAT_ROW; + Vector, VEC; + List, LIST; + CollectionItem, COLLECTION_ITEM; + + ParenthesizedExpr, PARENTHESIZED_EXPR; + Expression, EXPR; + + Pipeline, PIPELINE; + + Instruction, INSTR; + InstructionName, INSTR_NAME; + InstructionParams, INSTR_PARAMS; + + AttributeSet, ATTR_SET; + Attribute, ATTR; + AttributeName, ATTR_NAME; + AttributeValue, ATTR_VALUE; + + ParseError, PARSE_ERR; + LexError, LEX_ERR; + + Root, ROOT; + Eof, EOF +); diff --git a/crates/lang/src/lib.rs b/crates/lang/src/lib.rs new file mode 100644 index 0000000..f48385e --- /dev/null +++ b/crates/lang/src/lib.rs @@ -0,0 +1,25 @@ +#![feature(type_alias_impl_trait, lint_reasons, box_into_inner)] + +use crate::lst_parser::syntax_kind::SyntaxKind; + +pub mod ast; +pub mod lst_parser; +pub mod world; + +#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] +pub enum Lang {} +impl rowan::Language for Lang { + type Kind = SyntaxKind; + #[allow(unsafe_code)] + fn kind_from_raw(raw: rowan::SyntaxKind) -> Self::Kind { + assert!(raw.0 <= SyntaxKind::ROOT as u16); + unsafe { std::mem::transmute::(raw.0) } + } + fn kind_to_raw(kind: Self::Kind) -> rowan::SyntaxKind { + kind.into() + } +} + +pub type SyntaxNode = rowan::SyntaxNode; +pub type SyntaxToken = rowan::SyntaxNode; +pub type SyntaxElement = rowan::NodeOrToken; diff --git a/crates/lang/src/lst_parser.rs b/crates/lang/src/lst_parser.rs new file mode 100644 index 0000000..5c90bb0 --- /dev/null +++ b/crates/lang/src/lst_parser.rs @@ -0,0 +1,169 @@ +use drop_bomb::DropBomb; + +use self::{ + error::SyntaxError, + events::{Event, NodeKind}, + input::Input, + syntax_kind::SyntaxKind, +}; +use std::cell::Cell; + +pub mod syntax_kind; +#[cfg(test)] +mod tests; + +pub mod error; +pub mod events; +pub mod grammar; +pub mod input; +pub mod output; + +const PARSER_STEP_LIMIT: u32 = 4096; + +pub struct Parser<'src, 'toks> { + input: Input<'src, 'toks>, + pos: usize, + events: Vec, + steps: Cell, +} + +impl<'src, 'toks> Parser<'src, 'toks> { + pub fn new(input: Input<'src, 'toks>) -> Self { + Self { + input, + pos: 0, + events: Vec::new(), + steps: Cell::new(0), + } + } + + pub fn finish(self) -> Vec { + self.events + } + + pub(crate) fn nth(&self, n: usize) -> SyntaxKind { + self.step(); + self.input.kind(self.pos + n) + } + + pub fn eat_succeeding_ws(&mut self) { + self.push_ev(Event::Eat { + count: self.input.meaningless_tail_len(), + }); + } + + pub(crate) fn current(&self) -> SyntaxKind { + self.step(); + self.input.kind(self.pos) + } + + pub(crate) fn start(&mut self, name: &str) -> Marker { + let pos = self.events.len(); + self.push_ev(Event::tombstone()); + Marker::new(pos, name) + } + + pub(crate) fn at(&self, kind: SyntaxKind) -> bool { + self.nth_at(0, kind) + } + + pub(crate) fn eat(&mut self, kind: SyntaxKind) -> bool { + if !self.at(kind) { + return false; + } + + self.do_bump(); + true + } + + pub(crate) fn nth_at(&self, n: usize, kind: SyntaxKind) -> bool { + self.nth(n) == kind + } + + fn do_bump(&mut self) { + self.push_ev(Event::Eat { + count: self.input.preceding_meaningless(self.pos), + }); + self.pos += 1; + } + + fn push_ev(&mut self, event: Event) { + self.events.push(event) + } + + fn step(&self) { + let steps = self.steps.get(); + assert!(steps <= PARSER_STEP_LIMIT, "the parser seems stuck..."); + self.steps.set(steps + 1); + } +} + +pub(crate) struct Marker { + pos: usize, + bomb: DropBomb, +} + +impl Marker { + pub(crate) fn new(pos: usize, name: &str) -> Self { + Self { + pos, + bomb: DropBomb::new(format!("Marker {name} must be completed or abandoned")), + } + } + + fn close_node(mut self, p: &mut Parser, kind: NodeKind) -> CompletedMarker { + self.bomb.defuse(); + match &mut p.events[self.pos] { + Event::Start { kind: slot, .. } => *slot = kind.clone(), + _ => unreachable!(), + } + + p.push_ev(Event::Finish); + + CompletedMarker { + pos: self.pos, + kind, + } + } + + pub(crate) fn complete(self, p: &mut Parser<'_, '_>, kind: SyntaxKind) -> CompletedMarker { + self.close_node(p, NodeKind::Syntax(kind)) + } + + pub(crate) fn error(self, p: &mut Parser, kind: SyntaxError) -> CompletedMarker { + self.close_node(p, NodeKind::Error(kind)) + } + + pub(crate) fn abandon(mut self, p: &mut Parser<'_, '_>) { + self.bomb.defuse(); + if self.pos == p.events.len() - 1 { + match p.events.pop() { + Some(Event::Start { + kind: NodeKind::Syntax(SyntaxKind::TOMBSTONE), + forward_parent: None, + }) => (), + _ => unreachable!(), + } + } + } +} + +pub(crate) struct CompletedMarker { + pos: usize, + kind: NodeKind, +} + +impl CompletedMarker { + pub(crate) fn precede(self, p: &mut Parser<'_, '_>, name: &str) -> Marker { + let new_pos = p.start(name); + + match &mut p.events[self.pos] { + Event::Start { forward_parent, .. } => { + *forward_parent = Some(new_pos.pos - self.pos); + } + _ => unreachable!(), + } + + new_pos + } +} diff --git a/crates/lang/src/lst_parser/error.rs b/crates/lang/src/lst_parser/error.rs new file mode 100644 index 0000000..73f290f --- /dev/null +++ b/crates/lang/src/lst_parser/error.rs @@ -0,0 +1,15 @@ +use crate::lst_parser::syntax_kind::SyntaxKind; + +#[derive(Debug, PartialEq, Eq, Clone)] +pub enum SyntaxError { + Expected(Vec), + PipelineNeedsSink, + // if there was two space seperated items in a list + SpaceSepInList, + SemicolonInList, + CommaInMatOrVec, + UnterminatedTopLevelItem, + UnclosedModuleBody, + UnfinishedPath, + PathSepContainsSemicolon, +} diff --git a/crates/lang/src/lst_parser/events.rs b/crates/lang/src/lst_parser/events.rs new file mode 100644 index 0000000..3ed630a --- /dev/null +++ b/crates/lang/src/lst_parser/events.rs @@ -0,0 +1,70 @@ +use crate::lst_parser::syntax_kind::SyntaxKind; + +use super::error::SyntaxError; + +#[derive(Debug)] +pub enum Event { + Start { + kind: NodeKind, + forward_parent: Option, + }, + Finish, + Eat { + count: usize, + }, +} + +#[derive(Debug, Clone, PartialEq)] +pub enum NodeKind { + Syntax(SyntaxKind), + Error(SyntaxError), +} + +impl NodeKind { + pub fn is_syntax(&self) -> bool { + matches!(self, Self::Syntax(_)) + } + + pub fn is_error(&self) -> bool { + matches!(self, Self::Error(_)) + } +} + +impl From for NodeKind { + fn from(value: SyntaxKind) -> Self { + NodeKind::Syntax(value) + } +} + +impl From for NodeKind { + fn from(value: SyntaxError) -> Self { + NodeKind::Error(value) + } +} + +impl PartialEq for NodeKind { + fn eq(&self, other: &SyntaxKind) -> bool { + match self { + NodeKind::Syntax(s) => s == other, + NodeKind::Error(_) => false, + } + } +} + +impl PartialEq for NodeKind { + fn eq(&self, other: &SyntaxError) -> bool { + match self { + NodeKind::Syntax(_) => false, + NodeKind::Error(e) => e == other, + } + } +} + +impl Event { + pub(crate) fn tombstone() -> Self { + Self::Start { + kind: SyntaxKind::TOMBSTONE.into(), + forward_parent: None, + } + } +} diff --git a/crates/lang/src/lst_parser/grammar.rs b/crates/lang/src/lst_parser/grammar.rs new file mode 100644 index 0000000..001050e --- /dev/null +++ b/crates/lang/src/lst_parser/grammar.rs @@ -0,0 +1,38 @@ +use std::fmt::Debug; + +use crate::lst_parser::syntax_kind::SyntaxKind::*; + +use self::module::{mod_body, top_level_item}; + +use super::{ + input::Input, + output::Output, + syntax_kind::{self, lex}, + Parser, +}; + +mod expression; +mod module; + +pub fn source_file(p: &mut Parser) { + let root = p.start("root"); + + mod_body(p); + // expression::expression(p, false); + p.eat_succeeding_ws(); + + root.complete(p, ROOT); +} + +fn check_parser(input: &str, parser_fn: fn(&mut Parser), output: &str) { + let toks = lex(input); + let mut parser = Parser::new(Input::new(&toks)); + + parser_fn(&mut parser); + + let p_out = dbg!(parser.finish()); + let o = Output::from_parser_output(toks, p_out); + + let s = strip_ansi_escapes::strip_str(format!("{o:?}")); + assert_eq!(&s, output); +} diff --git a/crates/lang/src/lst_parser/grammar/expression.rs b/crates/lang/src/lst_parser/grammar/expression.rs new file mode 100644 index 0000000..03c0d10 --- /dev/null +++ b/crates/lang/src/lst_parser/grammar/expression.rs @@ -0,0 +1,44 @@ +use crate::lst_parser::{error::SyntaxError, syntax_kind::SyntaxKind::*, CompletedMarker, Parser}; + +use self::{collection::collection, instruction::instr, lit::literal, pipeline::PIPES}; + +mod collection; +mod instruction; +mod lit; +mod pipeline; + +pub fn expression(p: &mut Parser, in_pipe: bool) -> Option { + let expr = p.start("expr"); + + if atom(p).or_else(|| instr(p)).is_none() { + expr.abandon(p); + return None; + } + + let r = expr.complete(p, EXPR); + + if PIPES.contains(p.current()) && !in_pipe { + pipeline::pipeline(p, r) + } else { + Some(r) + } +} + +pub fn atom(p: &mut Parser) -> Option { + literal(p) + .or_else(|| collection(p)) + .or_else(|| parenthesized_expr(p)) +} + +pub fn parenthesized_expr(p: &mut Parser) -> Option { + if p.eat(L_PAREN) { + let par_expr = p.start("parenthesized"); + expression(p, false); + if !p.eat(R_PAREN) { + return Some(par_expr.error(p, SyntaxError::Expected(vec![R_PAREN]))); + } + + return Some(par_expr.complete(p, PARENTHESIZED_EXPR)); + } + None +} diff --git a/crates/lang/src/lst_parser/grammar/expression/collection.rs b/crates/lang/src/lst_parser/grammar/expression/collection.rs new file mode 100644 index 0000000..8535291 --- /dev/null +++ b/crates/lang/src/lst_parser/grammar/expression/collection.rs @@ -0,0 +1,25 @@ +use enumset::enum_set; + +use crate::lst_parser::{ + syntax_kind::{SyntaxKind::*, TokenSet}, + CompletedMarker, Parser, +}; + +use self::{attr_set::attr_set, vec::vec_matrix_list}; + +mod attr_set; +mod vec; + +const COLLECTION_START: TokenSet = enum_set!(L_BRACK | L_BRACE); + +pub fn collection(p: &mut Parser) -> Option { + if !COLLECTION_START.contains(p.current()) { + return None; + } + + Some(match p.current() { + L_BRACK => vec_matrix_list(p), + L_BRACE => attr_set(p), + _ => unreachable!(), + }) +} diff --git a/crates/lang/src/lst_parser/grammar/expression/collection/attr_set.rs b/crates/lang/src/lst_parser/grammar/expression/collection/attr_set.rs new file mode 100644 index 0000000..b5a73fa --- /dev/null +++ b/crates/lang/src/lst_parser/grammar/expression/collection/attr_set.rs @@ -0,0 +1,45 @@ +use crate::lst_parser::{ + error::SyntaxError, + grammar::expression::{atom, expression}, + CompletedMarker, Marker, Parser, + SyntaxKind::*, +}; + +pub fn attr_set(p: &mut Parser) -> CompletedMarker { + let start = p.start("attr_set_start"); + assert!(p.eat(L_BRACE)); + + loop { + if attr(p).is_some() { + // TODO: handle others + if p.eat(COMMA) { + continue; + } else if p.eat(R_BRACE) { + return start.complete(p, ATTR_SET); + } + // TODO: check for newline and stuff following that for recov of others + } else if p.eat(R_BRACE) { + return start.complete(p, ATTR_SET); + } + } +} + +fn attr(p: &mut Parser) -> Option { + if p.at(IDENT) { + let attr_start = p.start("attr"); + let attr_name_start = p.start("attr_name"); + p.do_bump(); + attr_name_start.complete(p, ATTR_NAME); + + // TODO: handle comma, expr/atom, other + p.eat(COLON); + + // TODO: handle failed expr parser too + let attr_value = p.start("attr_value"); + let _ = expression(p, false); + attr_value.complete(p, ATTR_VALUE); + Some(attr_start.complete(p, ATTR)) + } else { + None + } +} diff --git a/crates/lang/src/lst_parser/grammar/expression/collection/vec.rs b/crates/lang/src/lst_parser/grammar/expression/collection/vec.rs new file mode 100644 index 0000000..4dfd299 --- /dev/null +++ b/crates/lang/src/lst_parser/grammar/expression/collection/vec.rs @@ -0,0 +1,97 @@ +use crate::lst_parser::{ + error::SyntaxError, grammar::expression::atom, CompletedMarker, Marker, Parser, SyntaxKind::*, +}; + +pub fn vec_matrix_list(p: &mut Parser) -> CompletedMarker { + let start = p.start("vec_matrix_list_start"); + assert!(p.eat(L_BRACK)); + let row_start = p.start("matrix_row_start"); + if let Some(item) = atom(p) { + item.precede(p, "coll_item_start") + .complete(p, COLLECTION_ITEM); + + if p.at(COMMA) { + row_start.abandon(p); + return finish_list(p, start); + } + + finish_mat_or_vec(p, start, row_start) + } else if p.eat(R_BRACK) { + row_start.abandon(p); + start.complete(p, LIST) + } else { + row_start.abandon(p); + start.error(p, SyntaxError::Expected(vec![EXPR, R_BRACK])) + } +} + +fn finish_list(p: &mut Parser, list_start: Marker) -> CompletedMarker { + loop { + if p.eat(COMMA) { + if let Some(item) = atom(p) { + item.precede(p, "coll_item_start") + .complete(p, COLLECTION_ITEM); + } else if p.eat(R_BRACK) { + return list_start.complete(p, LIST); + } + } else if p.eat(R_BRACK) { + return list_start.complete(p, LIST); + } else if let Some(item) = atom(p) { + item.precede(p, "next_item") + .complete(p, COLLECTION_ITEM) + .precede(p, "err_space_sep") + .error(p, SyntaxError::SpaceSepInList); + } else if p.at(SEMICOLON) { + let semi_err = p.start("semicolon_err"); + p.eat(SEMICOLON); + semi_err.error(p, SyntaxError::SemicolonInList); + if let Some(item) = atom(p) { + item.precede(p, "coll_item_start") + .complete(p, COLLECTION_ITEM); + } else if p.eat(R_BRACK) { + return list_start.complete(p, LIST); + } + } + } +} + +// TODO: handle commas, general other wrong toks +fn finish_mat_or_vec(p: &mut Parser, coll_start: Marker, mut row_start: Marker) -> CompletedMarker { + let mut is_matrix = false; + let mut row_item_count = 1; + loop { + if let Some(item) = atom(p) { + item.precede(p, "coll_item_start") + .complete(p, COLLECTION_ITEM); + row_item_count += 1; + } else if p.at(SEMICOLON) { + is_matrix = true; + row_start.complete(p, MAT_ROW); + p.eat(SEMICOLON); + row_start = p.start("matrix_row_start"); + row_item_count = 0; + } else if p.at(R_BRACK) { + if is_matrix && row_item_count == 0 { + row_start.abandon(p); + p.eat(R_BRACK); + return coll_start.complete(p, MATRIX); + } else if is_matrix { + row_start.complete(p, MAT_ROW); + p.eat(R_BRACK); + return coll_start.complete(p, MATRIX); + } else { + row_start.abandon(p); + p.eat(R_BRACK); + return coll_start.complete(p, VEC); + } + } else if p.at(COMMA) { + let err_unexpected_comma = p.start("err_unexpected_comma"); + p.do_bump(); + err_unexpected_comma.error(p, SyntaxError::CommaInMatOrVec); + } else { + let err_unexpected = p.start("err_unexpected_tok"); + p.do_bump(); + err_unexpected.error(p, SyntaxError::Expected(vec![EXPR, SEMICOLON, R_BRACK])); + } + } +} diff --git a/crates/lang/src/lst_parser/grammar/expression/instruction.rs b/crates/lang/src/lst_parser/grammar/expression/instruction.rs new file mode 100644 index 0000000..bbe0ed3 --- /dev/null +++ b/crates/lang/src/lst_parser/grammar/expression/instruction.rs @@ -0,0 +1,34 @@ +use crate::lst_parser::{syntax_kind::SyntaxKind::*, CompletedMarker, Parser}; + +use super::{atom, lit::literal}; + +pub fn instr(p: &mut Parser) -> Option { + if !p.at(IDENT) { + return None; + } + + let instr = p.start("instr"); + + instr_name(p); + instr_params(p); + + Some(instr.complete(p, INSTR)) +} + +fn instr_name(p: &mut Parser) { + let instr_name = p.start("instr_name"); + + while p.at(IDENT) { + p.do_bump(); + } + + instr_name.complete(p, INSTR_NAME); +} + +fn instr_params(p: &mut Parser) { + if let Some(start) = atom(p) { + while atom(p).is_some() {} + + start.precede(p, "params_start").complete(p, INSTR_PARAMS); + } +} diff --git a/crates/lang/src/lst_parser/grammar/expression/lit.rs b/crates/lang/src/lst_parser/grammar/expression/lit.rs new file mode 100644 index 0000000..8a18a04 --- /dev/null +++ b/crates/lang/src/lst_parser/grammar/expression/lit.rs @@ -0,0 +1,59 @@ +use enumset::enum_set; +use indoc::indoc; + +use crate::lst_parser::{ + grammar::check_parser, + syntax_kind::{SyntaxKind::*, TokenSet}, + CompletedMarker, Parser, +}; + +const LIT_TOKENS: TokenSet = enum_set!(INT_NUM | FLOAT_NUM | STRING); + +pub fn literal(p: &mut Parser) -> Option { + if !LIT_TOKENS.contains(p.current()) { + return None; + } + + let lit = p.start("lit"); + + p.do_bump(); + + Some(lit.complete(p, LITERAL)) +} + +#[test] +fn test_parse_lst_lit() { + check_parser( + "42", + |p| { + literal(p); + }, + indoc! {r#" + LITERAL { + INT_NUM "42"; + } + "#}, + ); + check_parser( + "3.14", + |p| { + literal(p); + }, + indoc! {r#" + LITERAL { + FLOAT_NUM "3.14"; + } + "#}, + ); + check_parser( + r#""Meow""#, + |p| { + literal(p); + }, + indoc! {r#" + LITERAL { + STRING "\"Meow\""; + } + "#}, + ); +} diff --git a/crates/lang/src/lst_parser/grammar/expression/pipeline.rs b/crates/lang/src/lst_parser/grammar/expression/pipeline.rs new file mode 100644 index 0000000..2c1c678 --- /dev/null +++ b/crates/lang/src/lst_parser/grammar/expression/pipeline.rs @@ -0,0 +1,36 @@ +use enumset::enum_set; + +use crate::lst_parser::{ + error::SyntaxError, + syntax_kind::{SyntaxKind::*, TokenSet}, + CompletedMarker, Parser, +}; + +use super::expression; + +pub fn pipeline(p: &mut Parser, start_expr: CompletedMarker) -> Option { + if !pipe(p) { + return Some(start_expr); + } + let pipeline_marker = start_expr.precede(p, "pipeline_start"); + + loop { + if expression(p, true).is_none() { + return Some(pipeline_marker.error(p, SyntaxError::PipelineNeedsSink)); + } + if !pipe(p) { + return Some(pipeline_marker.complete(p, PIPELINE)); + } + } +} + +pub const PIPES: TokenSet = enum_set!(PIPE | MAPPING_PIPE | NULL_PIPE); + +fn pipe(p: &mut Parser) -> bool { + if PIPES.contains(p.current()) { + p.do_bump(); + true + } else { + false + } +} diff --git a/crates/lang/src/lst_parser/grammar/module.rs b/crates/lang/src/lst_parser/grammar/module.rs new file mode 100644 index 0000000..008627c --- /dev/null +++ b/crates/lang/src/lst_parser/grammar/module.rs @@ -0,0 +1,191 @@ +use enumset::enum_set; + +use crate::lst_parser::{ + error::SyntaxError, + grammar::expression::expression, + syntax_kind::{SyntaxKind::*, TokenSet}, + CompletedMarker, Parser, +}; + +const TOP_LEVEL_ITEM_START: TokenSet = enum_set!(DEF_KW | MOD_KW | USE_KW); + +pub fn mod_body(p: &mut Parser) { + loop { + if top_level_item(p).is_none() { + break; + } + } +} + +fn mod_decl(p: &mut Parser) -> Option { + let mod_start = p.start("module"); + if !p.eat(MOD_KW) { + mod_start.abandon(p); + return None; + } + + let mod_name = p.start("module_name"); + if p.eat(IDENT) { + mod_name.complete(p, MODULE_NAME); + } else { + mod_name.error(p, SyntaxError::Expected(vec![IDENT])); + } + + let mod_body_marker = p.start("mod_body"); + if p.eat(SEMICOLON) { + mod_body_marker.abandon(p); + Some(mod_start.complete(p, MODULE)) + } else if p.eat(L_BRACE) { + mod_body(p); + if !p.eat(R_BRACE) { + mod_body_marker + .complete(p, MODULE_BODY) + .precede(p, "unclosed_mod_body_err") + .error(p, SyntaxError::UnclosedModuleBody); + } else { + mod_body_marker.complete(p, MODULE_BODY); + } + Some(mod_start.complete(p, MODULE)) + } else { + Some(mod_start.error(p, SyntaxError::Expected(vec![MODULE_BODY]))) + } +} + +pub fn top_level_item(p: &mut Parser) -> Option { + if !TOP_LEVEL_ITEM_START.contains(p.current()) { + return None; + } + def(p).or_else(|| mod_decl(p)).or_else(|| r#use(p)) +} + +fn def(p: &mut Parser) -> Option { + let def_start = p.start("top_level_def"); + if !p.eat(DEF_KW) { + def_start.abandon(p); + return None; + } + + let def_name = p.start("def_name"); + if p.eat(IDENT) { + def_name.complete(p, DEF_NAME); + } else { + def_name.error(p, SyntaxError::Expected(vec![IDENT])); + } + + let maybe_expected_eq = p.start("maybe_expect_eq"); + if !p.eat(EQ) { + maybe_expected_eq.error(p, SyntaxError::Expected(vec![EQ])); + } else { + maybe_expected_eq.abandon(p); + } + + let body = p.start("def_body"); + if expression(p, false).is_some() { + body.complete(p, DEF_BODY); + } else { + body.error(p, SyntaxError::Expected(vec![DEF_BODY])); + } + + Some(if p.eat(SEMICOLON) { + def_start.complete(p, DEF) + } else if TOP_LEVEL_ITEM_START.contains(p.current()) || p.at(EOF) { + def_start + .complete(p, DEF) + .precede(p, "unterminated_tl_item") + .error(p, SyntaxError::UnterminatedTopLevelItem) + } else { + def_start + .complete(p, DEF) + .precede(p, "err_unexpected") + .error(p, SyntaxError::Expected(vec![SEMICOLON])) + }) +} + +fn r#use(p: &mut Parser) -> Option { + let use_start = p.start("use_start"); + if !p.eat(USE_KW) { + use_start.abandon(p); + return None; + } + + if use_pat(p).is_none() { + p.start("expected_use_pat") + .error(p, SyntaxError::Expected(vec![USE_PAT])); + } + + let use_item = use_start.complete(p, USE); + Some(if p.eat(SEMICOLON) { + use_item + } else if TOP_LEVEL_ITEM_START.contains(p.current()) || p.at(EOF) { + use_item + .precede(p, "unterminated_tl_item") + .error(p, SyntaxError::UnterminatedTopLevelItem) + } else { + use_item + .precede(p, "err_unexpected") + .error(p, SyntaxError::Expected(vec![SEMICOLON])) + }) +} + +fn use_pat(p: &mut Parser) -> Option { + let use_pat_marker = p.start("use_pat"); + if !p.eat(IDENT) { + return None; + } + + loop { + if p.eat(PATH_SEP) { + if pat_item(p).is_none() { + break Some(use_pat_marker.error(p, SyntaxError::UnfinishedPath)); + } + } else if p.at(SEMICOLON) && p.nth_at(1, COLON) { + let broken_sep = p.start("broken_path_sep"); + let wrong_semi = p.start("semi_typo"); + p.eat(SEMICOLON); + wrong_semi.error(p, SyntaxError::PathSepContainsSemicolon); + p.eat(COLON); + broken_sep.complete(p, PATH_SEP); + if pat_item(p).is_none() { + break Some(use_pat_marker.error(p, SyntaxError::UnfinishedPath)); + } + } else if p.at(COLON) && p.nth_at(1, SEMICOLON) { + let broken_sep = p.start("broken_path_sep"); + p.eat(COLON); + let wrong_semi = p.start("semi_typo"); + p.eat(SEMICOLON); + wrong_semi.error(p, SyntaxError::PathSepContainsSemicolon); + broken_sep.complete(p, PATH_SEP); + if pat_item(p).is_none() { + break Some(use_pat_marker.error(p, SyntaxError::UnfinishedPath)); + } + } else if p.at(SEMICOLON) && p.nth_at(1, SEMICOLON) { + let broken_sep = p.start("broken_path_sep"); + p.eat(SEMICOLON); + p.eat(SEMICOLON); + broken_sep + .complete(p, PATH_SEP) + .precede(p, "semi_typo_err") + .error(p, SyntaxError::PathSepContainsSemicolon); + if pat_item(p).is_none() { + break Some(use_pat_marker.error(p, SyntaxError::UnfinishedPath)); + } + } else if p.eat(SEMICOLON) { + break Some(use_pat_marker.complete(p, USE_PAT)); + } else { + break Some(use_pat_marker.error(p, SyntaxError::Expected(vec![PATH_SEP, SEMICOLON]))); + } + } +} + +fn pat_item(p: &mut Parser) -> Option { + let item_start = p.start("pat_item_start"); + if p.eat(IDENT) { + Some(item_start.complete(p, PAT_ITEM)) + } else if p.eat(STAR) { + Some(item_start.complete(p, PAT_GLOB)) + } else if p.eat(L_BRACE) { + todo!("write PAT_GROUPs") + } else { + None + } +} diff --git a/crates/lang/src/lst_parser/input.rs b/crates/lang/src/lst_parser/input.rs new file mode 100644 index 0000000..a00d862 --- /dev/null +++ b/crates/lang/src/lst_parser/input.rs @@ -0,0 +1,70 @@ +use enumset::enum_set; + +use crate::lst_parser::syntax_kind::SyntaxKind; + +use super::syntax_kind::TokenSet; + +pub struct Input<'src, 'toks> { + raw: &'toks Vec<(SyntaxKind, &'src str)>, + /// indices of the "meaningful" tokens (not whitespace etc) + /// includes newlines because those might indeed help with finding errors + meaningful: Vec, + /// indices of newlines for the purpose of easily querying them + /// can be helpful with missing commas etc + newlines: Vec, +} + +pub const MEANINGLESS_TOKS: TokenSet = enum_set!(SyntaxKind::WHITESPACE | SyntaxKind::NEWLINE); + +impl<'src, 'toks> Input<'src, 'toks> { + pub fn new(raw_toks: &'toks Vec<(SyntaxKind, &'src str)>) -> Self { + let meaningful = raw_toks + .iter() + .enumerate() + .filter_map(|(i, tok)| { + if MEANINGLESS_TOKS.contains(tok.0) { + None + } else { + Some(i) + } + }) + .collect(); + let newlines = raw_toks + .iter() + .enumerate() + .filter_map(|(i, tok)| match tok.0 { + SyntaxKind::NEWLINE => Some(i), + _ => None, + }) + .collect(); + + Self { + raw: raw_toks, + meaningful, + newlines, + } + } + + #[allow(clippy::unwrap_used, reason = "meaningful indices cannot be invalid")] + pub(crate) fn kind(&self, idx: usize) -> SyntaxKind { + let Some(meaningful_idx) = self.meaningful.get(idx) else { + return SyntaxKind::EOF; + }; + + self.raw.get(*meaningful_idx).unwrap().0 + } + + pub(crate) fn preceding_meaningless(&self, idx: usize) -> usize { + assert!(self.meaningful.len() > idx); + + if idx == 0 { + 1 + } else { + self.meaningful[idx] - self.meaningful[idx - 1] + } + } + + pub(crate) fn meaningless_tail_len(&self) -> usize { + self.raw.len() - (self.meaningful.last().unwrap() + 1) + } +} diff --git a/crates/lang/src/lst_parser/output.rs b/crates/lang/src/lst_parser/output.rs new file mode 100644 index 0000000..78433b1 --- /dev/null +++ b/crates/lang/src/lst_parser/output.rs @@ -0,0 +1,208 @@ +use clap::builder; +use owo_colors::{unset_override, OwoColorize}; +use rowan::{GreenNode, GreenNodeBuilder, GreenNodeData, GreenTokenData, Language, NodeOrToken}; +use std::mem; + +use crate::{ + lst_parser::{input::MEANINGLESS_TOKS, syntax_kind::SyntaxKind}, + Lang, SyntaxNode, +}; + +use super::{ + error::SyntaxError, + events::{Event, NodeKind}, +}; + +pub struct Output { + pub green_node: GreenNode, + pub errors: Vec, +} + +impl std::fmt::Debug for Output { + fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { + let mut errs: Vec<&SyntaxError> = self.errors.iter().collect(); + errs.reverse(); + + debug_print_green_node(NodeOrToken::Node(&self.green_node), f, 0, &mut errs, false) + } +} + +const INDENT_STR: &str = " "; +/// colored argument currently broken +fn debug_print_green_node( + node: NodeOrToken<&GreenNodeData, &GreenTokenData>, + f: &mut dyn std::fmt::Write, + lvl: i32, + errs: &mut Vec<&SyntaxError>, + colored: bool, +) -> std::fmt::Result { + for _ in 0..lvl { + f.write_str(INDENT_STR)?; + } + + let r = match node { + NodeOrToken::Node(n) => { + let kind = Lang::kind_from_raw(node.kind()); + if kind != SyntaxKind::PARSE_ERR { + writeln!( + f, + "{:?} {}", + Lang::kind_from_raw(node.kind()).bright_yellow().bold(), + "{".yellow() + )?; + } else { + let err = errs + .pop() + .expect("all error syntax nodes should correspond to an error") + .bright_red(); + + writeln!( + f, + "{:?}{} {err:?} {}", + kind.bright_red().bold(), + ":".red(), + "{".bright_red().bold() + )?; + } + for c in n.children() { + debug_print_green_node(c, f, lvl + 1, errs, colored)?; + } + for _ in 0..lvl { + f.write_str(INDENT_STR)?; + } + if kind != SyntaxKind::PARSE_ERR { + write!(f, "{}", "}\n".yellow()) + } else { + write!(f, "{}", "}\n".bright_red().bold()) + } + } + NodeOrToken::Token(t) => { + let tok = Lang::kind_from_raw(t.kind()); + if MEANINGLESS_TOKS.contains(tok) { + writeln!( + f, + "{:?} {:?}{}", + Lang::kind_from_raw(t.kind()).white(), + t.text().white(), + ";".white() + ) + } else { + writeln!( + f, + "{:?} {:?}{}", + Lang::kind_from_raw(t.kind()).bright_cyan().bold(), + t.text().green(), + ";".yellow() + ) + } + } + }; + + r +} + +impl Output { + pub fn debug_colored(&self) -> String { + let mut out = String::new(); + let mut errs: Vec<&SyntaxError> = self.errors.iter().collect(); + errs.reverse(); + + let _ = debug_print_green_node( + NodeOrToken::Node(&self.green_node), + &mut out, + 0, + &mut errs, + true, + ); + + out + } + pub fn from_parser_output( + mut raw_toks: Vec<(SyntaxKind, &str)>, + mut events: Vec, + ) -> Self { + let mut builder = GreenNodeBuilder::new(); + let mut fw_parents = Vec::new(); + let mut errors = Vec::new(); + raw_toks.reverse(); + + for i in 0..events.len() { + match mem::replace(&mut events[i], Event::tombstone()) { + Event::Start { + kind, + forward_parent, + } => { + if kind == SyntaxKind::TOMBSTONE && forward_parent.is_none() { + continue; + } + + fw_parents.push(kind); + let mut idx = i; + let mut fp = forward_parent; + while let Some(fwd) = fp { + idx += fwd as usize; + fp = match mem::replace(&mut events[idx], Event::tombstone()) { + Event::Start { + kind, + forward_parent, + } => { + fw_parents.push(kind); + forward_parent + } + _ => unreachable!(), + } + } + + // remove whitespace bc it's ugly + while let Some((SyntaxKind::WHITESPACE | SyntaxKind::NEWLINE, _)) = + raw_toks.last() + { + match events.iter_mut().find(|ev| matches!(ev, Event::Eat { .. })) { + Some(Event::Eat { count }) => *count -= 1, + _ => unreachable!(), + } + + let (tok, text): (SyntaxKind, &str) = raw_toks.pop().unwrap(); + builder.token(tok.into(), text); + } + + for kind in fw_parents.drain(..).rev() { + match kind { + NodeKind::Syntax(kind) if kind != SyntaxKind::TOMBSTONE => { + builder.start_node(kind.into()) + } + NodeKind::Error(err) => { + errors.push(err); + builder.start_node(SyntaxKind::PARSE_ERR.into()) + } + _ => {} + } + } + } + Event::Finish => builder.finish_node(), + Event::Eat { count } => (0..count).for_each(|_| { + let (tok, text): (SyntaxKind, &str) = raw_toks.pop().unwrap(); + builder.token(tok.into(), text); + }), + } + } + + Self { + green_node: builder.finish(), + errors, + } + } + + pub fn syntax(&self) -> SyntaxNode { + SyntaxNode::new_root(self.green_node.clone()) + } + + pub fn errors(&self) -> Vec { + self.errors.clone() + } + + pub fn dissolve(self) -> (GreenNode, Vec) { + let Self { green_node, errors } = self; + (green_node, errors) + } +} diff --git a/crates/lang/src/lst_parser/syntax_kind.rs b/crates/lang/src/lst_parser/syntax_kind.rs new file mode 100644 index 0000000..5cb7fb1 --- /dev/null +++ b/crates/lang/src/lst_parser/syntax_kind.rs @@ -0,0 +1,140 @@ +use enumset::EnumSet; +use logos::Logos; + +pub fn lex(src: &str) -> Vec<(SyntaxKind, &str)> { + let mut lex = SyntaxKind::lexer(src); + let mut r = Vec::new(); + + while let Some(tok_res) = lex.next() { + r.push((tok_res.unwrap_or(SyntaxKind::LEX_ERR), lex.slice())) + } + + r +} + +#[derive(enumset::EnumSetType, Logos, Debug, PartialEq, Eq, Clone, Copy, Hash, PartialOrd, Ord)] +#[repr(u16)] +#[enumset(no_super_impls)] +#[allow(non_camel_case_types)] +pub enum SyntaxKind { + #[token("def")] + DEF_KW = 0, + DEF, + DEF_NAME, + DEF_BODY, + #[token("let")] + LET_KW, + #[token("in")] + IN_KW, + LET_IN, + #[token("::")] + PATH_SEP, + #[token("mod")] + MOD_KW, + MODULE, + MODULE_NAME, + MODULE_BODY, + USE, + #[token("use")] + USE_KW, + USE_PAT, + PAT_ITEM, + PAT_GLOB, + PAT_GROUP, + #[regex("[\\d]+")] + INT_NUM, + #[regex("[+-]?([\\d]+\\.[\\d]*|[\\d]*\\.[\\d]+)")] + FLOAT_NUM, + #[regex(r#""([^"\\]|\\["\\bnfrt]|u[a-fA-F0-9]{4})*""#)] + STRING, + MATRIX, + MAT_ROW, + VEC, + LIST, + // either of a vec, a matrix or a list + COLLECTION_ITEM, + PARENTHESIZED_EXPR, + EXPR, + LITERAL, + #[token("(")] + L_PAREN, + #[token(")")] + R_PAREN, + #[token("{")] + L_BRACE, + #[token("}")] + R_BRACE, + #[token("[")] + L_BRACK, + #[token("]")] + R_BRACK, + #[token("<")] + L_ANGLE, + #[token(">")] + R_ANGLE, + #[token("+")] + PLUS, + #[token("-")] + MINUS, + #[token("*")] + STAR, + #[token("/")] + SLASH, + #[token("%")] + PERCENT, + #[token("^")] + CARET, + INSTR, + INSTR_NAME, + INSTR_PARAMS, + ATTR_SET, + ATTR, + ATTR_NAME, + ATTR_VALUE, + #[regex("[a-zA-Z_]+[a-zA-Z_\\-\\d]*")] + IDENT, + #[regex("\\$[a-zA-Z0-9_\\-]+")] + VAR, + #[regex("\\@[a-zA-Z0-9_\\-]+")] + INPUT_VAR, + #[token("$")] + DOLLAR, + #[token("@")] + AT, + #[token(",")] + COMMA, + #[token("|")] + PIPE, + #[token("@|")] + MAPPING_PIPE, + #[token("!|")] + NULL_PIPE, + PIPELINE, + #[token("=")] + EQ, + #[token(":")] + COLON, + #[token(";")] + SEMICOLON, + #[token(".")] + DOT, + #[token("!")] + BANG, + #[regex("[ \\t\\f]+")] + WHITESPACE, + #[token("\n")] + NEWLINE, + PARSE_ERR, + LEX_ERR, + ROOT, + EOF, + TOMBSTONE, +} + +pub type TokenSet = EnumSet; + +impl From for rowan::SyntaxKind { + fn from(kind: SyntaxKind) -> Self { + Self(kind as u16) + } +} diff --git a/crates/lang/src/lst_parser/tests.rs b/crates/lang/src/lst_parser/tests.rs new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/crates/lang/src/lst_parser/tests.rs @@ -0,0 +1 @@ + diff --git a/crates/lang/src/main.rs b/crates/lang/src/main.rs new file mode 100644 index 0000000..e9c0257 --- /dev/null +++ b/crates/lang/src/main.rs @@ -0,0 +1,29 @@ +use clap::Parser; +use std::{fs, path::PathBuf}; + +use lang::lst_parser::{self, grammar, input, output::Output, syntax_kind}; + +#[derive(Parser)] +struct Args { + file: PathBuf, +} + +#[allow(clippy::unwrap_used)] +fn main() { + let args = Args::parse(); + let n = args.file.clone(); + let f = fs::read_to_string(n.clone()).expect("failed to read file"); + + let toks = dbg!(syntax_kind::lex(&f)); + let input = input::Input::new(&toks); + let mut parser = lst_parser::Parser::new(input); + + grammar::source_file(&mut parser); + + let p_out = dbg!(parser.finish()); + let o = Output::from_parser_output(toks, p_out); + + println!("{}", o.debug_colored()); + + // World::new(n); +} diff --git a/crates/lang/src/world.rs b/crates/lang/src/world.rs new file mode 100644 index 0000000..7713422 --- /dev/null +++ b/crates/lang/src/world.rs @@ -0,0 +1,27 @@ +use std::path::Path; + +use self::files::{Files, OpenFileError}; + +mod error; +mod files; + +struct World; + +impl World { + pub fn new(entry_point: &Path) -> Result { + let mut files = Files::default(); + let (entry_point_id, errors) = files.add_file(entry_point)?; + + todo!() + } +} + +enum WorldCreationError { + FailedToOpenEntryPoint(OpenFileError), +} + +impl From for WorldCreationError { + fn from(value: OpenFileError) -> Self { + Self::FailedToOpenEntryPoint(value) + } +} diff --git a/crates/lang/src/world/error.rs b/crates/lang/src/world/error.rs new file mode 100644 index 0000000..1cebf8d --- /dev/null +++ b/crates/lang/src/world/error.rs @@ -0,0 +1,10 @@ +use std::path::PathBuf; + +use crate::{ast::ParseError, lst_parser::error::SyntaxError}; + +use super::files::{FileId, Loc, OpenFileError}; + +pub enum Error { + Syntax(Loc, SyntaxError), + OpenFileError(OpenFileError), +} diff --git a/crates/lang/src/world/files.rs b/crates/lang/src/world/files.rs new file mode 100644 index 0000000..24053d7 --- /dev/null +++ b/crates/lang/src/world/files.rs @@ -0,0 +1,57 @@ +use std::{ + collections::HashMap, + io, + path::{Path, PathBuf}, +}; + +mod loc; + +pub use loc::Loc; +use rowan::ast::AstNode; + +use crate::{ + ast::ParseError, + lst_parser::{self, error::SyntaxError, input, output::Output}, + world::{error::Error, files::source_file::SourceFile}, +}; + +#[derive(Default)] +pub struct Files { + inner: Vec, + path_to_id_map: HashMap, +} + +impl Files { + pub fn add_file(&mut self, path: &Path) -> Result<(FileId, Vec), OpenFileError> { + if !path.exists() { + return Err(OpenFileError::NotFound(path.to_owned())); + } + + let file_id = FileId(self.inner.len()); + let (source_file, errs) = match SourceFile::open(path) { + Ok((source_file, errs)) => { + let errs = errs + .into_iter() + .map(|(ptr, err)| Error::Syntax(Loc::from_ptr(ptr, file_id), err)) + .collect::>(); + (source_file, errs) + } + Err(e) => return Err(OpenFileError::IoError(path.to_path_buf(), e)), + }; + + self.inner.push(source_file); + self.path_to_id_map.insert(path.to_path_buf(), file_id); + + Ok((file_id, errs)) + } +} + +pub enum OpenFileError { + NotFound(PathBuf), + IoError(PathBuf, std::io::Error), +} + +#[derive(Copy, Clone, Debug)] +pub struct FileId(usize); + +mod source_file; diff --git a/crates/lang/src/world/files/loc.rs b/crates/lang/src/world/files/loc.rs new file mode 100644 index 0000000..fa865d8 --- /dev/null +++ b/crates/lang/src/world/files/loc.rs @@ -0,0 +1,29 @@ +use rowan::ast::{AstNode, AstPtr}; + +use crate::Lang; + +use super::FileId; + +#[derive(Clone)] +pub struct Loc> { + file: FileId, + syntax: AstPtr, +} + +impl> Loc { + pub fn new(node: N, file: FileId) -> Self { + Self::from_ptr(AstPtr::new(&node), file) + } + + pub fn from_ptr(ptr: AstPtr, file: FileId) -> Self { + Self { file, syntax: ptr } + } + + pub fn file(&self) -> FileId { + self.file + } + + pub fn syntax(&self) -> AstPtr { + self.syntax.clone() + } +} diff --git a/crates/lang/src/world/files/source_file.rs b/crates/lang/src/world/files/source_file.rs new file mode 100644 index 0000000..8ed8043 --- /dev/null +++ b/crates/lang/src/world/files/source_file.rs @@ -0,0 +1,113 @@ +use crate::lst_parser::{self, grammar, input, syntax_kind}; +use crate::SyntaxNode; + +use crate::lst_parser::output::Output; + +use crate::lst_parser::error::SyntaxError; + +use crate::ast::ParseError; + +use rowan::ast::{AstNode, AstPtr}; + +use std::path::Path; +use std::{fs, io}; + +use rowan::GreenNode; + +use std::path::PathBuf; + +pub(crate) struct SourceFile { + pub(crate) path: PathBuf, + pub(crate) lst: rowan::GreenNode, +} + +impl SourceFile { + pub(crate) fn open(p: &Path) -> io::Result<(Self, Vec<(AstPtr, SyntaxError)>)> { + assert!(p.exists()); + + let f = fs::read_to_string(p)?; + let (lst, errs) = Self::parse(f); + + Ok(( + Self { + path: p.to_path_buf(), + lst, + }, + errs, + )) + } + + pub(crate) fn parse(f: String) -> (GreenNode, Vec<(AstPtr, SyntaxError)>) { + let toks = syntax_kind::lex(&f); + let input = input::Input::new(&toks); + let mut parser = lst_parser::Parser::new(input); + + grammar::source_file(&mut parser); + + let p_out = parser.finish(); + let (lst, errs) = Output::from_parser_output(toks, p_out).dissolve(); + + (lst.clone(), Self::find_errs(lst, errs)) + } + + pub(crate) fn find_errs( + lst: GreenNode, + mut errs: Vec, + ) -> Vec<(AstPtr, SyntaxError)> { + let mut out = Vec::new(); + errs.reverse(); + + let lst = SyntaxNode::new_root(lst); + Self::find_errs_recursive(&mut out, lst, &mut errs); + + out + } + + pub(crate) fn find_errs_recursive( + mut out: &mut Vec<(AstPtr, SyntaxError)>, + lst: SyntaxNode, + mut errs: &mut Vec, + ) { + lst.children() + .filter_map(|c| ParseError::cast(c)) + .for_each(|e| out.push((AstPtr::new(&e), errs.pop().unwrap()))); + + lst.children() + .for_each(|c| Self::find_errs_recursive(out, c, errs)); + } +} + +#[cfg(test)] +mod tests { + use crate::world::files::source_file::SourceFile; + + fn check_find_errs(input: &str, expected: &[&str]) { + let (_, errs) = SourceFile::parse(input.to_string()); + + let errs = errs + .into_iter() + .map(|(loc, err)| format!("{:?}@{:?}", err, loc.syntax_node_ptr().text_range())) + .collect::>(); + + assert_eq!( + errs, + expected + .into_iter() + .map(|s| s.to_string()) + .collect::>() + ) + } + + #[test] + fn test_find_errs() { + check_find_errs( + "def meow = ;\n mod ;", + &["Expected([DEF_BODY])@11..11", "Expected([IDENT])@18..18"], + ); + + check_find_errs( + "def awawa = a |", + &["UnterminatedTopLevelItem@0..15", "PipelineNeedsSink@12..15"], + ) + } +} diff --git a/crates/svg-filters/Cargo.toml b/crates/svg-filters/Cargo.toml new file mode 100644 index 0000000..7f41e66 --- /dev/null +++ b/crates/svg-filters/Cargo.toml @@ -0,0 +1,15 @@ +[package] +name = "svg-filters" +version = "0.1.0" +edition = "2021" + +# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html + +[dependencies] +csscolorparser = "0.6.2" +indexmap = "2.2.5" +petgraph = { workspace = true } +quick-xml = { version = "0.31.0", features = ["serialize"] } + +[lints] +workspace = true diff --git a/crates/svg-filters/src/codegen.rs b/crates/svg-filters/src/codegen.rs new file mode 100644 index 0000000..cd93d25 --- /dev/null +++ b/crates/svg-filters/src/codegen.rs @@ -0,0 +1,158 @@ +use std::{ + cmp, + collections::{BTreeSet, HashMap}, + fmt::Display, + io::Read, + ops::Not, +}; + +use indexmap::IndexMap; +use petgraph::{ + algo::toposort, + graph::DiGraph, + prelude::{EdgeIndex, NodeIndex}, +}; +use quick_xml::ElementWriter; + +use crate::{ + types::{ + graph::{edge::Edge, FilterGraph, NodeInput}, + nodes::{primitives::WriteElement, CommonAttrs}, + }, + Node, +}; + +use self::error::CodegenError; + +pub struct SvgDocument { + filters: HashMap, +} + +impl SvgDocument { + pub fn new() -> Self { + Self { + filters: HashMap::new(), + } + } + + #[allow(clippy::unwrap_used, reason = "we literally just did the insertion")] + pub fn create_filter(&mut self, id: impl ToString) -> &mut FilterGraph { + let filter = FilterGraph::new(); + + self.filters.insert(id.to_string(), filter); + self.filters.get_mut(&id.to_string()).unwrap() + } + + pub fn generate_svg_pretty(&self) -> String { + let mut result = Vec::new(); + let doc_writer = quick_xml::Writer::new_with_indent(&mut result, b' ', 2); + + self.generate(doc_writer); + + String::from_utf8_lossy(&result).to_string() + } + + pub fn generate_svg(&self) -> String { + let mut result = Vec::new(); + let doc_writer = quick_xml::Writer::new(&mut result); + + self.generate(doc_writer); + + String::from_utf8_lossy(&result).to_string() + } + + fn generate(&self, mut doc_writer: quick_xml::Writer<&mut Vec>) { + doc_writer + .create_element("svg") + .write_inner_content(|writer| { + self.filters + .iter() + .try_fold(writer, Self::gen_filter) + .map(|_| {}) + }); + } + + fn gen_filter<'w, 'r>( + writer: &'w mut quick_xml::Writer<&'r mut Vec>, + (id, graph): (&String, &FilterGraph), + ) -> Result<&'w mut quick_xml::Writer<&'r mut Vec>, CodegenError> { + writer + .create_element("filter") + .with_attribute(("id", id.as_str())) + .write_inner_content(|writer| Self::graph_to_svg(writer, graph)) + } + + fn graph_to_svg( + writer: &mut quick_xml::Writer<&mut Vec>, + graph: &FilterGraph, + ) -> Result<(), CodegenError> { + let sorted = toposort(&graph.dag, None).expect("no cycles allowed in a DAG"); + sorted + .into_iter() + .filter_map(|node_idx| { + graph + .dag + .node_weight(node_idx) + .and_then(|node| node.primitive()) + .map(|(primitive, common_attrs)| (node_idx, primitive, common_attrs)) + }) + .try_fold(writer, |writer, (node_idx, primitive, common_attrs)| { + primitive.element_writer( + writer, + *common_attrs, + graph + .inputs(node_idx) + .into_iter() + .map(|v| v.to_string()) + .collect(), + graph + .outputs(node_idx) + .is_empty() + .not() + .then_some(format!("r{}", node_idx.index())), + ) + })?; + + Ok(()) + } +} + +/// convenience method to avoid fuckups during future changes +fn format_edge_idx(idx: EdgeIndex) -> String { + format!("edge{}", idx.index()) +} + +fn format_node_idx(node_idx: NodeIndex) -> String { + format!("r{}", node_idx.index()) +} + +mod error { + use std::{error::Error, fmt::Display}; + + #[derive(Debug)] + pub enum CodegenError { + QuickXmlError(quick_xml::Error), + } + + impl From for CodegenError { + fn from(value: quick_xml::Error) -> Self { + Self::QuickXmlError(value) + } + } + + impl Display for CodegenError { + fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { + match self { + CodegenError::QuickXmlError(e) => e.fmt(f), + } + } + } + + impl Error for CodegenError {} +} + +impl Default for SvgDocument { + fn default() -> Self { + Self::new() + } +} diff --git a/crates/svg-filters/src/lib.rs b/crates/svg-filters/src/lib.rs new file mode 100644 index 0000000..2afb148 --- /dev/null +++ b/crates/svg-filters/src/lib.rs @@ -0,0 +1,40 @@ +#![feature(lint_reasons)] + +#[macro_use] +pub mod util { + macro_rules! gen_attr { + ($name:literal = $out:expr) => { + quick_xml::events::attributes::Attribute { + key: quick_xml::name::QName($name), + value: std::borrow::Cow::from(($out).to_string().into_bytes()), + } + }; + } + + macro_rules! gen_attrs { + ($($name:literal: $out:expr),+) => { + vec![ + $(gen_attr!($name = $out)),+ + ] + }; + ($($cond:expr => $name:literal: $out:expr),+) => { + { + let mut r = Vec::new(); + $(if $cond { + r.push(gen_attr!($name = $out)); + })+ + r + } + }; + ($other:ident; $($cond:expr => $name:literal: $out:expr),+) => { + $other.append(&mut gen_attrs![$($cond => $name: $out),+]); + }; + } +} + +pub mod codegen; +pub mod types; +pub use types::nodes::Node; + +#[cfg(test)] +mod tests; diff --git a/crates/svg-filters/src/main.rs b/crates/svg-filters/src/main.rs new file mode 100644 index 0000000..a063791 --- /dev/null +++ b/crates/svg-filters/src/main.rs @@ -0,0 +1,65 @@ +use svg_filters::{ + codegen::SvgDocument, + types::nodes::{ + primitives::{ + blend::BlendMode, + color_matrix::ColorMatrixType, + component_transfer::TransferFn, + displacement_map::Channel, + turbulence::{NoiseType, StitchTiles}, + }, + standard_input::StandardInput, + }, +}; + +fn main() { + let mut doc = SvgDocument::new(); + + let f = doc.create_filter("cmyk-chromabb"); + + let noise = f.turbulence(0., 0.1, 2, 0, StitchTiles::Stitch, NoiseType::FractalNoise); + let noise = f.component_transfer_rgba( + noise, + TransferFn::Discrete { + table_values: vec![0., 0.2, 0.4, 0.6, 0.8, 1.], + }, + TransferFn::Discrete { + table_values: vec![0., 0.2, 0.4, 0.6, 0.8, 1.], + }, + TransferFn::Discrete { + table_values: vec![0., 0.2, 0.4, 0.6, 0.8, 1.], + }, + TransferFn::Linear { + slope: 0., + intercept: 0.5, + }, + ); + + let cyan = f.color_matrix( + StandardInput::SourceGraphic, + ColorMatrixType::Matrix(Box::new([ + 0., 0., 0., 0., 0., // + 0., 1., 0., 0., 0., // + 0., 0., 1., 0., 0., // + 0., 0., 0., 1., 0., + ])), + ); + let cyan = f.offset(cyan, 25., 0.); + let cyan = f.displacement_map(cyan, noise, 50., Channel::R, Channel::A); + + let magenta = f.color_matrix( + StandardInput::SourceGraphic, + ColorMatrixType::Matrix(Box::new([ + 1., 0., 0., 0., 0., // + 0., 0., 0., 0., 0., // + 0., 0., 1., 0., 0., // + 0., 0., 0., 1., 0., + ])), + ); + let magenta = f.displacement_map(magenta, noise, 50., Channel::R, Channel::A); + let magenta = f.offset(magenta, -25., 0.); + + f.blend(cyan, magenta, BlendMode::Screen); + + println!("{}", doc.generate_svg_pretty()); +} diff --git a/crates/svg-filters/src/tests.rs b/crates/svg-filters/src/tests.rs new file mode 100644 index 0000000..742c457 --- /dev/null +++ b/crates/svg-filters/src/tests.rs @@ -0,0 +1,17 @@ +mod blend; +mod color_matrix; +mod complex; +mod component_transfer; +mod displacement_map; +mod flood; +mod gaussian_blur; +mod offset; +mod turbulence; +mod composite {} +mod convolve_matrix {} +mod diffuse_lighting {} +mod image {} +mod merge {} +mod morphology {} +mod specular_lighting {} +mod tile {} diff --git a/crates/svg-filters/src/tests/blend.rs b/crates/svg-filters/src/tests/blend.rs new file mode 100644 index 0000000..71aea21 --- /dev/null +++ b/crates/svg-filters/src/tests/blend.rs @@ -0,0 +1,20 @@ +use crate::{ + codegen::SvgDocument, + types::nodes::{primitives::blend::BlendMode, standard_input::StandardInput}, +}; + +#[test] +fn test_offset_blend() { + let mut doc = SvgDocument::new(); + + let blend = doc.create_filter("blend"); + + let offset0 = blend.offset(StandardInput::SourceGraphic, 100., 0.); + let offset1 = blend.offset(StandardInput::SourceGraphic, -100., 0.); + blend.blend(offset0, offset1, BlendMode::Multiply); + + assert_eq!( + doc.generate_svg(), + r#""# + ); +} diff --git a/crates/svg-filters/src/tests/color_matrix.rs b/crates/svg-filters/src/tests/color_matrix.rs new file mode 100644 index 0000000..e32d507 --- /dev/null +++ b/crates/svg-filters/src/tests/color_matrix.rs @@ -0,0 +1,25 @@ +use crate::{ + codegen::SvgDocument, + types::nodes::{primitives::color_matrix::ColorMatrixType, standard_input::StandardInput}, +}; + +#[test] +fn test_greyscale_channel_extraction() { + let mut doc = SvgDocument::new(); + let greyscale = doc.create_filter("greyscale"); + + greyscale.color_matrix( + StandardInput::SourceGraphic, + ColorMatrixType::Matrix(Box::new([ + 1., 0., 0., 0., 0., // + 1., 0., 0., 0., 0., // + 1., 0., 0., 0., 0., // + 0., 0., 0., 1., 0., + ])), + ); + + assert_eq!( + doc.generate_svg(), + r#""# + ); +} diff --git a/crates/svg-filters/src/tests/complex.rs b/crates/svg-filters/src/tests/complex.rs new file mode 100644 index 0000000..2936bb4 --- /dev/null +++ b/crates/svg-filters/src/tests/complex.rs @@ -0,0 +1,51 @@ +use crate::{ + codegen::SvgDocument, + types::nodes::{primitives::color_matrix::ColorMatrixType, standard_input::StandardInput}, +}; + +#[test] +fn test_chrom_abb() { + let mut doc = SvgDocument::new(); + let chromabb = doc.create_filter("chromabb_gen"); + + let chan_r = chromabb.color_matrix( + StandardInput::SourceGraphic, + ColorMatrixType::Matrix(Box::new([ + 1., 0., 0., 0., 0., // + 0., 0., 0., 0., 0., // + 0., 0., 0., 0., 0., // + 0., 0., 0., 1., 0., + ])), + ); + let offset_r = chromabb.offset(chan_r, 25., 0.); + let blur_r = chromabb.gaussian_blur_xy(offset_r, 5, 0); + + let chan_b = chromabb.color_matrix( + StandardInput::SourceGraphic, + ColorMatrixType::Matrix(Box::new([ + 0., 0., 0., 0., 0., // + 0., 0., 0., 0., 0., // + 0., 0., 1., 0., 0., // + 0., 0., 0., 1., 0., + ])), + ); + let offset_b = chromabb.offset(chan_b, -25., 0.); + let blur_b = chromabb.gaussian_blur_xy(offset_b, 5, 0); + + let composite_rb = chromabb.composite_arithmetic(blur_r, blur_b, 0., 1., 1., 0.); + + let chan_g = chromabb.color_matrix( + StandardInput::SourceGraphic, + ColorMatrixType::Matrix(Box::new([ + 0., 0., 0., 0., 0., // + 0., 1., 0., 0., 0., // + 0., 0., 0., 0., 0., // + 0., 0., 0., 1., 0., + ])), + ); + chromabb.composite_arithmetic(composite_rb, chan_g, 0., 1., 1., 0.); + assert_eq!( + doc.generate_svg(), + r#""# + ); +} diff --git a/crates/svg-filters/src/tests/component_transfer.rs b/crates/svg-filters/src/tests/component_transfer.rs new file mode 100644 index 0000000..8f24c6f --- /dev/null +++ b/crates/svg-filters/src/tests/component_transfer.rs @@ -0,0 +1,36 @@ +use crate::{ + codegen::SvgDocument, + types::nodes::primitives::{ + component_transfer::{ComponentTransfer, TransferFn}, + FePrimitive, + }, + Node, +}; + +#[test] +fn test_comp_trans_simple() { + let mut doc = SvgDocument::new(); + + let comptrans = doc.create_filter("comp_trans"); + + comptrans.add_node(Node::simple(FePrimitive::ComponentTransfer( + ComponentTransfer { + func_r: TransferFn::Table { + table_values: vec![0., 0.1, 0.4, 0.9], + }, + func_g: TransferFn::Discrete { + table_values: vec![0.1, 0.3, 0.5, 0.7, 0.9], + }, + func_b: TransferFn::Linear { + slope: 1.0, + intercept: 0.75, + }, + func_a: TransferFn::Identity, + }, + ))); + + assert_eq!( + doc.generate_svg(), + r#""# + ); +} diff --git a/crates/svg-filters/src/tests/displacement_map.rs b/crates/svg-filters/src/tests/displacement_map.rs new file mode 100644 index 0000000..3b41ff1 --- /dev/null +++ b/crates/svg-filters/src/tests/displacement_map.rs @@ -0,0 +1,32 @@ +use crate::{ + codegen::SvgDocument, + types::nodes::{ + primitives::{ + displacement_map::Channel, + turbulence::{NoiseType, StitchTiles}, + }, + standard_input::StandardInput, + }, +}; + +#[test] +fn test_displacement_map_simple() { + let mut doc = SvgDocument::new(); + + let displace = doc.create_filter("displace"); + + let simple_noise = + displace.turbulence(0.01, 0.01, 1, 0, StitchTiles::Stitch, NoiseType::Turbulence); + displace.displacement_map( + StandardInput::SourceGraphic, + simple_noise, + 128., + Channel::R, + Channel::R, + ); + + assert_eq!( + doc.generate_svg(), + r#""# + ); +} diff --git a/crates/svg-filters/src/tests/flood.rs b/crates/svg-filters/src/tests/flood.rs new file mode 100644 index 0000000..27ed8bc --- /dev/null +++ b/crates/svg-filters/src/tests/flood.rs @@ -0,0 +1,17 @@ +use csscolorparser::Color; + +use crate::codegen::SvgDocument; + +#[test] +fn test_flood_simple() { + let mut doc = SvgDocument::new(); + + let turbdispl = doc.create_filter("noiseDisplace"); + + turbdispl.flood(Color::new(0.9, 0.7, 0.85, 1.), 1.); + + assert_eq!( + doc.generate_svg(), + r##""## + ); +} diff --git a/crates/svg-filters/src/tests/gaussian_blur.rs b/crates/svg-filters/src/tests/gaussian_blur.rs new file mode 100644 index 0000000..f148684 --- /dev/null +++ b/crates/svg-filters/src/tests/gaussian_blur.rs @@ -0,0 +1,13 @@ +use crate::{codegen::SvgDocument, types::nodes::standard_input::StandardInput}; + +#[test] +fn test_simple_blur() { + let mut doc = SvgDocument::new(); + let blur = doc.create_filter("blur"); + + blur.gaussian_blur_xy(StandardInput::SourceGraphic, 30, 30); + assert_eq!( + doc.generate_svg(), + r#""# + ); +} diff --git a/crates/svg-filters/src/tests/offset.rs b/crates/svg-filters/src/tests/offset.rs new file mode 100644 index 0000000..380170e --- /dev/null +++ b/crates/svg-filters/src/tests/offset.rs @@ -0,0 +1,14 @@ +use crate::{codegen::SvgDocument, types::nodes::standard_input::StandardInput}; + +#[test] +fn test_offset_simple() { + let mut doc = SvgDocument::new(); + let offset = doc.create_filter("offset"); + + offset.offset(StandardInput::SourceGraphic, 25., -25.); + + assert_eq!( + doc.generate_svg(), + r#""# + ); +} diff --git a/crates/svg-filters/src/tests/turbulence.rs b/crates/svg-filters/src/tests/turbulence.rs new file mode 100644 index 0000000..dd53e7d --- /dev/null +++ b/crates/svg-filters/src/tests/turbulence.rs @@ -0,0 +1,25 @@ +use crate::{ + codegen::SvgDocument, + types::nodes::primitives::turbulence::{NoiseType, StitchTiles}, +}; + +#[test] +fn test_simple_turbulence() { + let mut doc = SvgDocument::new(); + + let noise = doc.create_filter("noise"); + + noise.turbulence( + 0.01, + 0.01, + 1, + 0, + StitchTiles::Stitch, + NoiseType::FractalNoise, + ); + + assert_eq!( + doc.generate_svg(), + r#""# + ); +} diff --git a/crates/svg-filters/src/types.rs b/crates/svg-filters/src/types.rs new file mode 100644 index 0000000..1290907 --- /dev/null +++ b/crates/svg-filters/src/types.rs @@ -0,0 +1,6 @@ +pub mod length; +pub mod nodes; + +// pub mod old; + +pub mod graph; diff --git a/crates/svg-filters/src/types/graph.rs b/crates/svg-filters/src/types/graph.rs new file mode 100644 index 0000000..4b63a87 --- /dev/null +++ b/crates/svg-filters/src/types/graph.rs @@ -0,0 +1,143 @@ +use std::fmt::{Debug, Display}; + +use petgraph::{prelude::NodeIndex, prelude::*}; + +use crate::Node; + +use super::nodes::standard_input::StandardInput; + +#[derive(Debug)] +pub struct FilterGraph { + pub dag: DiGraph, + source_graphic_idx: NodeIndex, + source_alpha_idx: NodeIndex, + background_image_idx: NodeIndex, + background_alpha_idx: NodeIndex, + fill_paint_idx: NodeIndex, + stroke_paint_idx: NodeIndex, +} + +impl Default for FilterGraph { + fn default() -> Self { + Self::new() + } +} + +#[derive(Debug, Clone, Copy)] +pub enum NodeInput { + Standard(StandardInput), + Idx(NodeIndex), +} + +impl Display for NodeInput { + fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { + match self { + NodeInput::Standard(s) => Debug::fmt(s, f), + NodeInput::Idx(idx) => write!(f, "r{}", idx.index()), + } + } +} + +impl From for NodeInput { + fn from(value: StandardInput) -> Self { + Self::Standard(value) + } +} + +impl From for NodeInput { + fn from(value: NodeIndex) -> Self { + Self::Idx(value) + } +} + +impl FilterGraph { + pub fn new() -> Self { + let mut dag = DiGraph::new(); + + let source_graphic_idx = dag.add_node(Node::StdInput(StandardInput::SourceGraphic)); + let source_alpha_idx = dag.add_node(Node::StdInput(StandardInput::SourceAlpha)); + let background_image_idx = dag.add_node(Node::StdInput(StandardInput::BackgroundImage)); + let background_alpha_idx = dag.add_node(Node::StdInput(StandardInput::BackgroundAlpha)); + let fill_paint_idx = dag.add_node(Node::StdInput(StandardInput::FillPaint)); + let stroke_paint_idx = dag.add_node(Node::StdInput(StandardInput::StrokePaint)); + + Self { + dag, + source_graphic_idx, + source_alpha_idx, + background_image_idx, + background_alpha_idx, + fill_paint_idx, + stroke_paint_idx, + } + } + + pub fn add_node(&mut self, node: Node) -> NodeIndex { + self.dag.add_node(node) + } + + fn resolve_input(&self, input: NodeInput) -> NodeIndex { + match input { + NodeInput::Standard(StandardInput::SourceGraphic) => self.source_graphic_idx, + NodeInput::Standard(StandardInput::SourceAlpha) => self.source_alpha_idx, + NodeInput::Standard(StandardInput::BackgroundImage) => self.background_image_idx, + NodeInput::Standard(StandardInput::BackgroundAlpha) => self.background_alpha_idx, + NodeInput::Standard(StandardInput::FillPaint) => self.fill_paint_idx, + NodeInput::Standard(StandardInput::StrokePaint) => self.stroke_paint_idx, + NodeInput::Idx(i) => i, + } + } + + #[allow( + clippy::unwrap_used, + reason = "we only operate on values we know exist, so unwrapping is safe" + )] + pub fn inputs(&self, node_idx: NodeIndex) -> Vec { + let mut inputs = self + .dag + .neighbors_directed(node_idx, Direction::Incoming) + .map(|input_idx| (self.dag.find_edge(input_idx, node_idx).unwrap(), input_idx)) + .collect::>(); + + inputs.sort_by(|(a, _), (b, _)| a.cmp(b)); + + inputs + .into_iter() + .map( + |(_, input_idx)| match self.dag.node_weight(input_idx).unwrap() { + Node::StdInput(s) => NodeInput::Standard(*s), + Node::Primitive { .. } => NodeInput::Idx(input_idx), + }, + ) + .collect() + } + + pub fn outputs(&self, node_idx: NodeIndex) -> Vec { + self.dag + .neighbors_directed(node_idx, Direction::Outgoing) + .collect() + } + + pub fn source_graphic(&self) -> NodeIndex { + self.source_graphic_idx + } + pub fn source_alpha(&self) -> NodeIndex { + self.source_alpha_idx + } + pub fn background_image(&self) -> NodeIndex { + self.background_image_idx + } + pub fn background_alpha(&self) -> NodeIndex { + self.background_alpha_idx + } + pub fn fill_paint(&self) -> NodeIndex { + self.fill_paint_idx + } + pub fn stroke_paint(&self) -> NodeIndex { + self.stroke_paint_idx + } +} + +pub mod abstracted_inputs; + +pub mod edge; diff --git a/crates/svg-filters/src/types/graph/abstracted_inputs.rs b/crates/svg-filters/src/types/graph/abstracted_inputs.rs new file mode 100644 index 0000000..8d84707 --- /dev/null +++ b/crates/svg-filters/src/types/graph/abstracted_inputs.rs @@ -0,0 +1,196 @@ +use csscolorparser::Color; +use petgraph::{data::Build, prelude::NodeIndex}; + +use crate::{ + types::nodes::primitives::{ + blend::BlendMode, + color_matrix::ColorMatrixType, + component_transfer::TransferFn, + displacement_map::Channel, + turbulence::{NoiseType, StitchTiles}, + }, + Node, +}; + +use super::{FilterGraph, NodeInput}; + +impl FilterGraph { + pub fn color_matrix( + &mut self, + r#in: impl Into, + cm_type: ColorMatrixType, + ) -> NodeIndex { + let node_idx = self.dag.add_node(Node::color_matrix(cm_type)); + self.dag + .add_edge(self.resolve_input(r#in.into()), node_idx, ()); + node_idx + } + + pub fn offset(&mut self, r#in: impl Into, dx: f32, dy: f32) -> NodeIndex { + let node_idx = self.dag.add_node(Node::offset(dx, dy)); + self.dag + .add_edge(self.resolve_input(r#in.into()), node_idx, ()); + node_idx + } + + pub fn gaussian_blur_xy(&mut self, r#in: impl Into, x: u16, y: u16) -> NodeIndex { + let node_idx = self.dag.add_node(Node::gaussian_blur_xy(x, y)); + self.dag + .add_edge(self.resolve_input(r#in.into()), node_idx, ()); + node_idx + } + + pub fn blend( + &mut self, + r#in: impl Into, + in2: impl Into, + mode: BlendMode, + ) -> NodeIndex { + let node_idx = self.dag.add_node(Node::blend(mode)); + self.dag + .add_edge(self.resolve_input(r#in.into()), node_idx, ()); + self.dag + .add_edge(self.resolve_input(in2.into()), node_idx, ()); + node_idx + } + + pub fn composite_arithmetic( + &mut self, + r#in: impl Into, + in2: impl Into, + k1: f32, + k2: f32, + k3: f32, + k4: f32, + ) -> NodeIndex { + let node_idx = self + .dag + .add_node(Node::composite_arithmetic(k1, k2, k3, k4)); + self.dag + .add_edge(self.resolve_input(r#in.into()), node_idx, ()); + self.dag + .add_edge(self.resolve_input(in2.into()), node_idx, ()); + node_idx + } + + pub fn component_transfer_rgba( + &mut self, + r#in: impl Into, + r: TransferFn, + g: TransferFn, + b: TransferFn, + a: TransferFn, + ) -> NodeIndex { + let node_idx = self.dag.add_node(Node::component_transfer_rgba(r, g, b, a)); + self.dag + .add_edge(self.resolve_input(r#in.into()), node_idx, ()); + node_idx + } + pub fn component_transfer_rgb( + &mut self, + r#in: impl Into, + r: TransferFn, + g: TransferFn, + b: TransferFn, + ) -> NodeIndex { + let node_idx = self.dag.add_node(Node::component_transfer_rgb(r, g, b)); + self.dag + .add_edge(self.resolve_input(r#in.into()), node_idx, ()); + node_idx + } + pub fn component_transfer_r( + &mut self, + r#in: impl Into, + func: TransferFn, + ) -> NodeIndex { + let node_idx = self.dag.add_node(Node::component_transfer_r(func)); + self.dag + .add_edge(self.resolve_input(r#in.into()), node_idx, ()); + node_idx + } + pub fn component_transfer_g( + &mut self, + r#in: impl Into, + func: TransferFn, + ) -> NodeIndex { + let node_idx = self.dag.add_node(Node::component_transfer_g(func)); + self.dag + .add_edge(self.resolve_input(r#in.into()), node_idx, ()); + node_idx + } + pub fn component_transfer_b( + &mut self, + r#in: impl Into, + func: TransferFn, + ) -> NodeIndex { + let node_idx = self.dag.add_node(Node::component_transfer_b(func)); + self.dag + .add_edge(self.resolve_input(r#in.into()), node_idx, ()); + node_idx + } + pub fn component_transfer_a( + &mut self, + r#in: impl Into, + func: TransferFn, + ) -> NodeIndex { + let node_idx = self.dag.add_node(Node::component_transfer_a(func)); + self.dag + .add_edge(self.resolve_input(r#in.into()), node_idx, ()); + node_idx + } + pub fn component_transfer_single( + &mut self, + r#in: impl Into, + func: TransferFn, + ) -> NodeIndex { + let node_idx = self.dag.add_node(Node::component_transfer_single(func)); + self.dag + .add_edge(self.resolve_input(r#in.into()), node_idx, ()); + node_idx + } + + pub fn flood(&mut self, flood_color: Color, flood_opacity: f32) -> NodeIndex { + self.dag.add_node(Node::flood(flood_color, flood_opacity)) + } + + pub fn flood_opaque(&mut self, flood_color: Color) -> NodeIndex { + self.dag.add_node(Node::flood_opaque(flood_color)) + } + + pub fn turbulence( + &mut self, + base_freq_x: f32, + base_freq_y: f32, + num_octaves: u16, + seed: u32, + stitch_tiles: StitchTiles, + noise_type: NoiseType, + ) -> NodeIndex { + self.dag.add_node(Node::turbulence( + base_freq_x, + base_freq_y, + num_octaves, + seed, + stitch_tiles, + noise_type, + )) + } + + pub fn displacement_map( + &mut self, + source_image: impl Into, + displacement_map: impl Into, + scale: f32, + x_channel: Channel, + y_channel: Channel, + ) -> NodeIndex { + let node_idx = self + .dag + .add_node(Node::displacement_map(scale, x_channel, y_channel)); + self.dag + .add_edge(self.resolve_input(source_image.into()), node_idx, ()); + self.dag + .add_edge(self.resolve_input(displacement_map.into()), node_idx, ()); + node_idx + } +} diff --git a/crates/svg-filters/src/types/graph/edge.rs b/crates/svg-filters/src/types/graph/edge.rs new file mode 100644 index 0000000..0783a34 --- /dev/null +++ b/crates/svg-filters/src/types/graph/edge.rs @@ -0,0 +1,19 @@ +#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Default)] +pub struct Edge { + input_idx: u8, +} + +impl Edge { + pub fn new(input_idx: u8) -> Self { + Self { input_idx } + } +} + +impl ToString for Edge { + fn to_string(&self) -> String { + match self.input_idx { + 0 => "in".to_owned(), + n => format!("in{}", n + 1), + } + } +} diff --git a/crates/svg-filters/src/types/length.rs b/crates/svg-filters/src/types/length.rs new file mode 100644 index 0000000..ef9d2ef --- /dev/null +++ b/crates/svg-filters/src/types/length.rs @@ -0,0 +1,48 @@ +use std::fmt::Display; + +#[derive(Default, Debug, Clone, Copy)] +pub struct Length(f32, Unit); + +impl Length { + pub fn is_zero(&self) -> bool { + self.0 == 0. + } +} + +impl Display for Length { + fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { + write!(f, "{}{}", self.0, self.1) + } +} + +pub type Coordinate = Length; + +#[derive(Default, Debug, Clone, Copy)] +pub enum Unit { + #[default] + None, + Em, + Ex, + Px, + In, + Cm, + Mm, + Pt, + Pc, +} + +impl Display for Unit { + fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { + match self { + Unit::None => f.write_str(""), + Unit::Em => f.write_str("em"), + Unit::Ex => f.write_str("ex"), + Unit::Px => f.write_str("px"), + Unit::In => f.write_str("in"), + Unit::Cm => f.write_str("cm"), + Unit::Mm => f.write_str("mm"), + Unit::Pt => f.write_str("pt"), + Unit::Pc => f.write_str("pc"), + } + } +} diff --git a/crates/svg-filters/src/types/nodes.rs b/crates/svg-filters/src/types/nodes.rs new file mode 100644 index 0000000..797e7e4 --- /dev/null +++ b/crates/svg-filters/src/types/nodes.rs @@ -0,0 +1,237 @@ +use std::borrow::Cow; + +use csscolorparser::Color; +use quick_xml::{events::attributes::Attribute, name::QName}; + +use self::{ + primitives::{ + blend::{Blend, BlendMode}, + color_matrix::{ColorMatrix, ColorMatrixType}, + component_transfer::{ComponentTransfer, TransferFn}, + composite::{Composite, CompositeOperator}, + displacement_map::{Channel, DisplacementMap}, + flood::Flood, + gaussian_blur::GaussianBlur, + offset::Offset, + turbulence::{NoiseType, StitchTiles, Turbulence}, + FePrimitive, + }, + standard_input::StandardInput, +}; + +use super::length::{Coordinate, Length}; + +pub mod primitives; +pub mod standard_input; + +#[derive(Debug)] +pub enum Node { + StdInput(StandardInput), + Primitive { + primitive: FePrimitive, + common_attrs: CommonAttrs, + }, +} + +impl Default for Node { + fn default() -> Self { + Self::StdInput(StandardInput::SourceGraphic) + } +} + +#[derive(Default, Debug, Clone, Copy)] +pub struct CommonAttrs { + pub x: Coordinate, + pub y: Coordinate, + pub width: Length, + pub height: Length, +} + +impl From for Vec> { + fn from(val: CommonAttrs) -> Self { + gen_attrs![ + !val.x.is_zero() => b"x": val.x, + !val.y.is_zero() => b"y": val.y, + !val.width.is_zero() => b"width": val.width, + !val.height.is_zero() => b"height": val.height + ] + } +} + +impl Node { + pub fn simple(el: FePrimitive) -> Node { + Node::Primitive { + primitive: el, + common_attrs: CommonAttrs::default(), + } + } + + pub fn primitive(&self) -> Option<(&FePrimitive, &CommonAttrs)> { + if let Node::Primitive { + primitive, + common_attrs, + } = self + { + Some((primitive, common_attrs)) + } else { + None + } + } + + pub fn input_count(&self) -> u8 { + match self { + Node::Primitive { + primitive: + FePrimitive::ColorMatrix(_) + | FePrimitive::ComponentTransfer(_) + | FePrimitive::ConvolveMatrix(_) + | FePrimitive::DiffuseLighting(_) + | FePrimitive::GaussianBlur(_) + | FePrimitive::Morphology(_) + | FePrimitive::Offset(_) + | FePrimitive::SpecularLighting(_) + | FePrimitive::Tile(_), + .. + } => 1, + + Node::Primitive { + primitive: + FePrimitive::Composite(_) | FePrimitive::Blend(_) | FePrimitive::DisplacementMap(_), + .. + } => 2, + + Node::StdInput(_) + | Node::Primitive { + primitive: + FePrimitive::Flood(_) | FePrimitive::Image(_) | FePrimitive::Turbulence(_), + .. + } => 0, + Node::Primitive { + primitive: FePrimitive::Merge(_), + .. + } => todo!(), + } + } + + pub fn blend(mode: BlendMode) -> Self { + Self::simple(FePrimitive::Blend(Blend::new(mode))) + } + + pub fn color_matrix(cm_type: ColorMatrixType) -> Self { + Self::simple(FePrimitive::ColorMatrix(ColorMatrix::new(cm_type))) + } + + pub fn composite(op: CompositeOperator) -> Self { + Self::simple(FePrimitive::Composite(Composite::new(op))) + } + + pub fn composite_arithmetic(k1: f32, k2: f32, k3: f32, k4: f32) -> Self { + Self::composite(CompositeOperator::Arithmetic { k1, k2, k3, k4 }) + } + + pub fn gaussian_blur(v: u16) -> Self { + Self::simple(FePrimitive::GaussianBlur(GaussianBlur::single(v))) + } + + pub fn gaussian_blur_xy(x: u16, y: u16) -> Self { + Self::simple(FePrimitive::GaussianBlur(GaussianBlur::with_xy(x, y))) + } + + pub fn offset(dx: f32, dy: f32) -> Self { + Self::simple(FePrimitive::Offset(Offset::new(dx, dy))) + } + + pub fn component_transfer_rgba( + r: TransferFn, + g: TransferFn, + b: TransferFn, + a: TransferFn, + ) -> Self { + Self::simple(FePrimitive::ComponentTransfer(ComponentTransfer { + func_r: r, + func_g: g, + func_b: b, + func_a: a, + })) + } + + pub fn component_transfer_rgb(r: TransferFn, g: TransferFn, b: TransferFn) -> Self { + Self::component_transfer_rgba(r, g, b, TransferFn::Identity) + } + + pub fn component_transfer_r(func: TransferFn) -> Self { + Self::component_transfer_rgba( + func, + TransferFn::Identity, + TransferFn::Identity, + TransferFn::Identity, + ) + } + + pub fn component_transfer_g(func: TransferFn) -> Self { + Self::component_transfer_rgba( + TransferFn::Identity, + func, + TransferFn::Identity, + TransferFn::Identity, + ) + } + + pub fn component_transfer_b(func: TransferFn) -> Self { + Self::component_transfer_rgba( + TransferFn::Identity, + TransferFn::Identity, + func, + TransferFn::Identity, + ) + } + + pub fn component_transfer_a(func: TransferFn) -> Self { + Self::component_transfer_rgba( + TransferFn::Identity, + TransferFn::Identity, + TransferFn::Identity, + func, + ) + } + + pub fn component_transfer_single(func: TransferFn) -> Self { + Self::component_transfer_rgb(func.clone(), func.clone(), func) + } + + pub fn flood(flood_color: Color, flood_opacity: f32) -> Self { + Self::simple(FePrimitive::Flood(Flood { + flood_color, + flood_opacity, + })) + } + + pub fn flood_opaque(flood_color: Color) -> Self { + Self::flood(flood_color, 1.) + } + + pub fn turbulence( + base_freq_x: f32, + base_freq_y: f32, + num_octaves: u16, + seed: u32, + stitch_tiles: StitchTiles, + noise_type: NoiseType, + ) -> Self { + Self::simple(FePrimitive::Turbulence(Turbulence { + base_frequency: (base_freq_x, base_freq_y), + num_octaves, + seed, + stitch_tiles, + noise_type, + })) + } + + pub fn displacement_map(scale: f32, x_channel: Channel, y_channel: Channel) -> Self { + Self::simple(FePrimitive::DisplacementMap(DisplacementMap { + scale, + x_channel_selector: x_channel, + y_channel_selector: y_channel, + })) + } +} diff --git a/crates/svg-filters/src/types/nodes/primitives.rs b/crates/svg-filters/src/types/nodes/primitives.rs new file mode 100644 index 0000000..4675b8e --- /dev/null +++ b/crates/svg-filters/src/types/nodes/primitives.rs @@ -0,0 +1,150 @@ +use quick_xml::{events::attributes::Attribute, ElementWriter, Writer}; +use std::convert::Into; + +use super::CommonAttrs; + +pub mod blend; +pub mod color_matrix; +pub mod component_transfer; +pub mod composite; +pub mod convolve_matrix; +pub mod diffuse_lighting; +pub mod displacement_map; +pub mod flood; +pub mod gaussian_blur; +pub mod image; +pub mod merge; +pub mod morphology; +pub mod offset; +pub mod specular_lighting; +pub mod tile; +pub mod turbulence; + +pub trait WriteElement { + fn attrs(&self) -> Vec; + fn tag_name(&self) -> &'static str; + fn element_writer<'writer, 'result>( + &self, + writer: &'writer mut Writer<&'result mut Vec>, + common: CommonAttrs, + inputs: Vec, + output: Option, + ) -> quick_xml::Result<&'writer mut quick_xml::Writer<&'result mut Vec>> { + let attrs: Vec<_> = inputs + .into_iter() + .enumerate() + .map(|(i, edge)| { + ( + match i { + 0 => "in".to_owned(), + n => format!("in{}", n + 1), + } + .into_bytes(), + edge.into_bytes(), + ) + }) + .collect(); + let mut el_writer = writer + .create_element(self.tag_name()) + .with_attributes(Into::>>::into(common)) + .with_attributes(self.attrs()) + .with_attributes(attrs.iter().map(|(k, v)| (&k[..], &v[..]))); + if let Some(output) = output { + el_writer = el_writer.with_attribute(("result", output.as_str())); + } + + el_writer.write_empty() + } +} + +/// svg filter effects primitives +#[derive(Debug)] +pub enum FePrimitive { + Blend(blend::Blend), + ColorMatrix(color_matrix::ColorMatrix), + ComponentTransfer(component_transfer::ComponentTransfer), + Composite(composite::Composite), + ConvolveMatrix(convolve_matrix::ConvolveMatrix), + DiffuseLighting(diffuse_lighting::DiffuseLighting), + DisplacementMap(displacement_map::DisplacementMap), + Flood(flood::Flood), + GaussianBlur(gaussian_blur::GaussianBlur), + Image(image::Image), + Merge(merge::Merge), + Morphology(morphology::Morphology), + Offset(offset::Offset), + SpecularLighting(specular_lighting::SpecularLighting), + Tile(tile::Tile), + Turbulence(turbulence::Turbulence), +} + +impl WriteElement for FePrimitive { + fn attrs(&self) -> std::vec::Vec> { + match self { + FePrimitive::Blend(el) => el.attrs(), + FePrimitive::ColorMatrix(el) => el.attrs(), + FePrimitive::ComponentTransfer(el) => el.attrs(), + FePrimitive::Composite(el) => el.attrs(), + FePrimitive::GaussianBlur(el) => el.attrs(), + FePrimitive::Offset(el) => el.attrs(), + FePrimitive::Turbulence(el) => el.attrs(), + FePrimitive::DisplacementMap(el) => el.attrs(), + FePrimitive::Flood(el) => el.attrs(), + FePrimitive::Morphology(el) => el.attrs(), + FePrimitive::ConvolveMatrix(_) => todo!(), + FePrimitive::DiffuseLighting(_) => todo!(), + FePrimitive::Image(_) => todo!(), + FePrimitive::Merge(_) => todo!(), + FePrimitive::SpecularLighting(_) => todo!(), + FePrimitive::Tile(_) => todo!(), + } + } + + fn tag_name(&self) -> &'static str { + match self { + FePrimitive::Blend(el) => el.tag_name(), + FePrimitive::ColorMatrix(el) => el.tag_name(), + FePrimitive::ComponentTransfer(el) => el.tag_name(), + FePrimitive::Composite(el) => el.tag_name(), + FePrimitive::GaussianBlur(el) => el.tag_name(), + FePrimitive::Offset(el) => el.tag_name(), + FePrimitive::Turbulence(el) => el.tag_name(), + FePrimitive::DisplacementMap(el) => el.tag_name(), + FePrimitive::Flood(el) => el.tag_name(), + FePrimitive::Morphology(el) => el.tag_name(), + FePrimitive::ConvolveMatrix(_) => todo!(), + FePrimitive::DiffuseLighting(_) => todo!(), + FePrimitive::Image(_) => todo!(), + FePrimitive::Merge(_) => todo!(), + FePrimitive::SpecularLighting(_) => todo!(), + FePrimitive::Tile(_) => todo!(), + } + } + + fn element_writer<'writer, 'result>( + &self, + writer: &'writer mut Writer<&'result mut Vec>, + common: CommonAttrs, + inputs: Vec, + output: Option, + ) -> quick_xml::Result<&'writer mut quick_xml::Writer<&'result mut Vec>> { + match self { + FePrimitive::Blend(el) => el.element_writer(writer, common, inputs, output), + FePrimitive::ColorMatrix(el) => el.element_writer(writer, common, inputs, output), + FePrimitive::ComponentTransfer(el) => el.element_writer(writer, common, inputs, output), + FePrimitive::Composite(el) => el.element_writer(writer, common, inputs, output), + FePrimitive::Turbulence(el) => el.element_writer(writer, common, inputs, output), + FePrimitive::GaussianBlur(el) => el.element_writer(writer, common, inputs, output), + FePrimitive::Offset(el) => el.element_writer(writer, common, inputs, output), + FePrimitive::DisplacementMap(el) => el.element_writer(writer, common, inputs, output), + FePrimitive::Flood(el) => el.element_writer(writer, common, inputs, output), + FePrimitive::Morphology(el) => el.element_writer(writer, common, inputs, output), + FePrimitive::ConvolveMatrix(_) => todo!(), + FePrimitive::DiffuseLighting(_) => todo!(), + FePrimitive::Image(_) => todo!(), + FePrimitive::Merge(_) => todo!(), + FePrimitive::SpecularLighting(_) => todo!(), + FePrimitive::Tile(_) => todo!(), + } + } +} diff --git a/crates/svg-filters/src/types/nodes/primitives/blend.rs b/crates/svg-filters/src/types/nodes/primitives/blend.rs new file mode 100644 index 0000000..3e28401 --- /dev/null +++ b/crates/svg-filters/src/types/nodes/primitives/blend.rs @@ -0,0 +1,82 @@ +use std::fmt::Display; + +use super::WriteElement; + +/// [feBlend](https://www.w3.org/TR/SVG11/filters.html#feBlendElement) +#[derive(Debug)] +pub struct Blend { + mode: BlendMode, +} + +impl Blend { + pub fn new(mode: BlendMode) -> Self { + Self { mode } + } +} + +impl Default for Blend { + fn default() -> Self { + Self { + mode: BlendMode::Normal, + } + } +} + +impl WriteElement for Blend { + fn attrs(&self) -> Vec { + if let BlendMode::Normal = self.mode { + Vec::new() + } else { + gen_attrs![b"mode": self.mode] + } + } + + fn tag_name(&self) -> &'static str { + "feBlend" + } +} + +/// as according to https://drafts.fxtf.org/compositing-1/#blending +#[derive(Debug)] +pub enum BlendMode { + Normal, + Multiply, + Screen, + Overlay, + Darken, + Lighten, + ColorDodge, + ColorBurn, + HardLight, + SoftLight, + Difference, + Exclusion, + + Hue, + Saturation, + Color, + Luminosity, +} + +impl Display for BlendMode { + fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { + f.write_str(match self { + BlendMode::Normal => "normal", + BlendMode::Multiply => "multiply", + BlendMode::Screen => "screen", + BlendMode::Overlay => "overlay", + BlendMode::Darken => "darken", + BlendMode::Lighten => "lighten", + BlendMode::ColorDodge => "color-dodge", + BlendMode::ColorBurn => "color-burn", + BlendMode::HardLight => "hard-light", + BlendMode::SoftLight => "soft-light", + BlendMode::Difference => "difference", + BlendMode::Exclusion => "exclusion", + BlendMode::Hue => "hue", + BlendMode::Saturation => "saturation", + BlendMode::Color => "color", + BlendMode::Luminosity => "luminosity", + }) + } +} diff --git a/crates/svg-filters/src/types/nodes/primitives/color_matrix.rs b/crates/svg-filters/src/types/nodes/primitives/color_matrix.rs new file mode 100644 index 0000000..3a31b7d --- /dev/null +++ b/crates/svg-filters/src/types/nodes/primitives/color_matrix.rs @@ -0,0 +1,47 @@ +use super::WriteElement; + +/// [feColorMatrix](https://www.w3.org/TR/SVG11/filters.html#feColorMatrixElement) +#[derive(Debug)] +pub struct ColorMatrix { + cm_type: ColorMatrixType, +} + +impl ColorMatrix { + pub fn new(cm_type: ColorMatrixType) -> Self { + Self { cm_type } + } +} + +impl WriteElement for ColorMatrix { + fn attrs(&self) -> Vec { + match &self.cm_type { + ColorMatrixType::Matrix(v) => gen_attrs![ + b"values": v + .iter() + .map(std::string::ToString::to_string) + .reduce(|mut acc, e| { + acc.push(' '); + acc.push_str(&e); + acc + }) + .expect("fixed length arr should always work") + ], + ColorMatrixType::Saturate(v) | ColorMatrixType::HueRotate(v) => { + gen_attrs![b"values": v] + } + ColorMatrixType::LuminanceToAlpha => Vec::new(), + } + } + + fn tag_name(&self) -> &'static str { + "feColorMatrix" + } +} + +#[derive(Debug)] +pub enum ColorMatrixType { + Matrix(Box<[f32; 20]>), + Saturate(f32), + HueRotate(f32), + LuminanceToAlpha, +} diff --git a/crates/svg-filters/src/types/nodes/primitives/component_transfer.rs b/crates/svg-filters/src/types/nodes/primitives/component_transfer.rs new file mode 100644 index 0000000..3f8a3a3 --- /dev/null +++ b/crates/svg-filters/src/types/nodes/primitives/component_transfer.rs @@ -0,0 +1,134 @@ +use quick_xml::{events::attributes::Attribute, Writer}; + +use super::WriteElement; + +/// [feComponentTransfer](https://www.w3.org/TR/SVG11/filters.html#feComponentTransferElement) +#[derive(Debug)] +pub struct ComponentTransfer { + pub func_r: TransferFn, + pub func_g: TransferFn, + pub func_b: TransferFn, + pub func_a: TransferFn, +} + +impl WriteElement for ComponentTransfer { + fn attrs(&self) -> Vec { + Vec::new() + } + + fn tag_name(&self) -> &'static str { + "feComponentTransfer" + } + + fn element_writer<'writer, 'result>( + &self, + writer: &'writer mut quick_xml::Writer<&'result mut Vec>, + common: crate::types::nodes::CommonAttrs, + inputs: Vec, + output: Option, + ) -> quick_xml::Result<&'writer mut quick_xml::Writer<&'result mut Vec>> { + let inputs: Vec<_> = inputs + .into_iter() + .enumerate() + .map(|(i, edge)| { + ( + match i { + 0 => "in".to_owned(), + n => format!("in{}", n + 1), + } + .into_bytes(), + edge.into_bytes(), + ) + }) + .collect(); + let mut el_writer = writer + .create_element(self.tag_name()) + .with_attributes(inputs.iter().map(|(k, v)| (&k[..], &v[..]))) + .with_attributes(Into::>>::into(common)); + if let Some(output) = output { + el_writer = el_writer.with_attribute(("result", output.as_str())); + } + + el_writer.write_inner_content(|writer| { + self.func_r.write_self(writer, "feFuncR")?; + self.func_g.write_self(writer, "feFuncG")?; + self.func_b.write_self(writer, "feFuncB")?; + self.func_a.write_self(writer, "feFuncA")?; + Ok(()) + }) + } +} + +/// [transfer functions](https://www.w3.org/TR/SVG11/filters.html#transferFuncElements) +#[derive(Debug, Clone)] +pub enum TransferFn { + Identity, + Table { + table_values: Vec, + }, + Discrete { + table_values: Vec, + }, + Linear { + slope: f32, + intercept: f32, + }, + Gamma { + amplitude: f32, + exponent: f32, + offset: f32, + }, +} + +impl TransferFn { + #[allow(clippy::str_to_string, reason = "inside macro call")] + fn write_self<'writer, 'result>( + &self, + target: &'writer mut Writer<&'result mut Vec>, + name: &'static str, + ) -> quick_xml::Result<&'writer mut Writer<&'result mut Vec>> { + target + .create_element(name) + .with_attributes(match self { + TransferFn::Identity => gen_attrs![b"type": "identity"], + TransferFn::Table { table_values } => gen_attrs![ + b"type": "table", + b"tableValues": table_values + .iter() + .map(std::string::ToString::to_string) + .reduce(|mut acc, e| { + acc.push(' '); + acc.push_str(&e); + acc + }).expect("empty tables disallowed") + ], + TransferFn::Discrete { table_values } => gen_attrs![ + b"type": "discrete", + b"tableValues": table_values + .iter() + .map(std::string::ToString::to_string) + .reduce(|mut acc, e| { + acc.push(' '); + acc.push_str(&e); + acc + }).expect("empty tables disallowed") + ], + TransferFn::Linear { slope, intercept } => gen_attrs![ + b"type": "linear", + b"slope": slope, + b"intercept": intercept + ], + TransferFn::Gamma { + amplitude, + exponent, + offset, + } => gen_attrs![ + b"type": "gamma", + b"amplitude": amplitude, + b"exponent": exponent, + b"offset": offset + ], + }) + .write_empty() + } +} diff --git a/crates/svg-filters/src/types/nodes/primitives/composite.rs b/crates/svg-filters/src/types/nodes/primitives/composite.rs new file mode 100644 index 0000000..45f639c --- /dev/null +++ b/crates/svg-filters/src/types/nodes/primitives/composite.rs @@ -0,0 +1,86 @@ +use std::borrow::Cow; + +use quick_xml::{events::attributes::Attribute, name::QName}; + +use super::WriteElement; + +/// [feComposite](https://www.w3.org/TR/SVG11/filters.html#feCompositeElement) +#[derive(Debug)] +pub struct Composite { + operator: CompositeOperator, +} + +impl Composite { + pub fn new(op: CompositeOperator) -> Self { + Self { operator: op } + } + + pub fn arithmetic(k1: f32, k2: f32, k3: f32, k4: f32) -> Self { + Self { + operator: CompositeOperator::Arithmetic { k1, k2, k3, k4 }, + } + } +} + +#[derive(Debug)] +pub enum CompositeOperator { + Over, + In, + Out, + Atop, + Xor, + Arithmetic { k1: f32, k2: f32, k3: f32, k4: f32 }, +} + +impl WriteElement for Composite { + fn attrs(&self) -> Vec { + let (op_name, vals) = match self.operator { + CompositeOperator::Over => ("over", None), + CompositeOperator::In => ("in", None), + CompositeOperator::Out => ("out", None), + CompositeOperator::Atop => ("atop", None), + CompositeOperator::Xor => ("xor", None), + CompositeOperator::Arithmetic { k1, k2, k3, k4 } => { + ("arithmetic", Some([k1, k2, k3, k4])) + } + }; + + let mut r = vec![Attribute { + key: QName(b"operator"), + value: Cow::from(op_name.as_bytes()), + }]; + + if let Some([k1, k2, k3, k4]) = vals { + // r.append(&mut vec![ + // Attribute { + // key: QName(b"k1"), + // value: Cow::from(k1.to_string().into_bytes()), + // }, + // Attribute { + // key: QName(b"k2"), + // value: Cow::from(k2.to_string().into_bytes()), + // }, + // Attribute { + // key: QName(b"k3"), + // value: Cow::from(k3.to_string().into_bytes()), + // }, + // Attribute { + // key: QName(b"k4"), + // value: Cow::from(k4.to_string().into_bytes()), + // }, + // ]); + r.append(&mut gen_attrs![ + b"k1": k1, + b"k2": k2, + b"k3": k3, + b"k4": k4 + ]); + } + + r + } + + fn tag_name(&self) -> &'static str { + "feComposite" + } +} diff --git a/crates/svg-filters/src/types/nodes/primitives/convolve_matrix.rs b/crates/svg-filters/src/types/nodes/primitives/convolve_matrix.rs new file mode 100644 index 0000000..1fe2ef4 --- /dev/null +++ b/crates/svg-filters/src/types/nodes/primitives/convolve_matrix.rs @@ -0,0 +1,20 @@ +#[derive(Debug)] +pub struct ConvolveMatrix { + order: (u16, u16), + // must be checked to be `order.0 * order.1` + kernel_matrix: Vec, + divisor: f32, + bias: f32, + target_x: i32, + target_y: i32, + edge_mode: EdgeMode, + kernel_unit_length: (f32, f32), + preserve_alpha: bool, +} + +#[derive(Debug)] +enum EdgeMode { + None, + Duplicate, + Wrap, +} diff --git a/crates/svg-filters/src/types/nodes/primitives/diffuse_lighting.rs b/crates/svg-filters/src/types/nodes/primitives/diffuse_lighting.rs new file mode 100644 index 0000000..5d9cd6f --- /dev/null +++ b/crates/svg-filters/src/types/nodes/primitives/diffuse_lighting.rs @@ -0,0 +1,3 @@ +// TODO +#[derive(Debug)] +pub struct DiffuseLighting; diff --git a/crates/svg-filters/src/types/nodes/primitives/displacement_map.rs b/crates/svg-filters/src/types/nodes/primitives/displacement_map.rs new file mode 100644 index 0000000..189291e --- /dev/null +++ b/crates/svg-filters/src/types/nodes/primitives/displacement_map.rs @@ -0,0 +1,34 @@ +use super::WriteElement; + +/// [feDisplacementMap](https://www.w3.org/TR/SVG11/filters.html#feDisplacementMapElement) +#[derive(Debug)] +pub struct DisplacementMap { + pub scale: f32, + pub x_channel_selector: Channel, + pub y_channel_selector: Channel, +} + +impl WriteElement for DisplacementMap { + fn attrs(&self) -> Vec { + let mut r = Vec::new(); + gen_attrs![ + r; + self.scale != 0. => b"scale": self.scale, + self.x_channel_selector != Channel::A => b"xChannelSelector": format!("{:?}", self.x_channel_selector), + self.y_channel_selector != Channel::A => b"yChannelSelector": format!("{:?}", self.y_channel_selector) + ]; + r + } + + fn tag_name(&self) -> &'static str { + "feDisplacementMap" + } +} + +#[derive(Debug, PartialEq, Eq)] +pub enum Channel { + A, + R, + G, + B, +} diff --git a/crates/svg-filters/src/types/nodes/primitives/flood.rs b/crates/svg-filters/src/types/nodes/primitives/flood.rs new file mode 100644 index 0000000..df912ef --- /dev/null +++ b/crates/svg-filters/src/types/nodes/primitives/flood.rs @@ -0,0 +1,23 @@ +use csscolorparser::Color; + +use super::WriteElement; + +/// [feFlood](https://www.w3.org/TR/SVG11/filters.html#feFloodElement) +#[derive(Debug)] +pub struct Flood { + pub flood_color: Color, + pub flood_opacity: f32, +} + +impl WriteElement for Flood { + fn attrs(&self) -> Vec { + gen_attrs![ + b"flood-color": self.flood_color.to_hex_string(), + b"flood-opacity": self.flood_opacity + ] + } + + fn tag_name(&self) -> &'static str { + "feFlood" + } +} diff --git a/crates/svg-filters/src/types/nodes/primitives/gaussian_blur.rs b/crates/svg-filters/src/types/nodes/primitives/gaussian_blur.rs new file mode 100644 index 0000000..cd18f72 --- /dev/null +++ b/crates/svg-filters/src/types/nodes/primitives/gaussian_blur.rs @@ -0,0 +1,35 @@ +use std::borrow::Cow; + +use quick_xml::{events::attributes::Attribute, name::QName}; + +use super::WriteElement; + +/// [feGaussianBlur](https://www.w3.org/TR/SVG11/filters.html#feGaussianBlurElement) +#[derive(Debug)] +pub struct GaussianBlur { + std_deviation: (u16, u16), +} + +impl GaussianBlur { + pub fn single(v: u16) -> Self { + Self { + std_deviation: (v, v), + } + } + + pub fn with_xy(x: u16, y: u16) -> Self { + Self { + std_deviation: (x, y), + } + } +} + +impl WriteElement for GaussianBlur { + fn attrs(&self) -> Vec { + gen_attrs![b"stdDeviation": format!("{} {}", self.std_deviation.0, self.std_deviation.1)] + } + + fn tag_name(&self) -> &'static str { + "feGaussianBlur" + } +} diff --git a/crates/svg-filters/src/types/nodes/primitives/image.rs b/crates/svg-filters/src/types/nodes/primitives/image.rs new file mode 100644 index 0000000..c52c0b7 --- /dev/null +++ b/crates/svg-filters/src/types/nodes/primitives/image.rs @@ -0,0 +1,3 @@ +// TODO +#[derive(Debug)] +pub struct Image; diff --git a/crates/svg-filters/src/types/nodes/primitives/merge.rs b/crates/svg-filters/src/types/nodes/primitives/merge.rs new file mode 100644 index 0000000..ab26374 --- /dev/null +++ b/crates/svg-filters/src/types/nodes/primitives/merge.rs @@ -0,0 +1,3 @@ +// TODO +#[derive(Debug)] +pub struct Merge; diff --git a/crates/svg-filters/src/types/nodes/primitives/morphology.rs b/crates/svg-filters/src/types/nodes/primitives/morphology.rs new file mode 100644 index 0000000..f6b7bbf --- /dev/null +++ b/crates/svg-filters/src/types/nodes/primitives/morphology.rs @@ -0,0 +1,37 @@ +use super::WriteElement; +use std::fmt::Display; + +/// [feMorphology](https://www.w3.org/TR/SVG11/filters.html#feMorphologyElement) +#[derive(Debug)] +pub struct Morphology { + operator: Operator, + radius: (f32, f32), +} + +impl WriteElement for Morphology { + fn attrs(&self) -> Vec { + gen_attrs![ + b"operator": self.operator, + b"radius": format!("{} {}", self.radius.0, self.radius.1) + ] + } + + fn tag_name(&self) -> &'static str { + "feMorphology" + } +} + +#[derive(Debug)] +enum Operator { + Erode, + Dilate, +} + +impl Display for Operator { + fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { + f.write_str(match self { + Operator::Erode => "erode", + Operator::Dilate => "dilate", + }) + } +} diff --git a/crates/svg-filters/src/types/nodes/primitives/offset.rs b/crates/svg-filters/src/types/nodes/primitives/offset.rs new file mode 100644 index 0000000..7ccf2fd --- /dev/null +++ b/crates/svg-filters/src/types/nodes/primitives/offset.rs @@ -0,0 +1,24 @@ +use super::WriteElement; + +/// [feOffset](https://www.w3.org/TR/SVG11/filters.html#feOffsetElement) +#[derive(Debug)] +pub struct Offset { + dx: f32, + dy: f32, +} + +impl Offset { + pub fn new(dx: f32, dy: f32) -> Self { + Self { dx, dy } + } +} + +impl WriteElement for Offset { + fn attrs(&self) -> Vec { + gen_attrs![b"dx": self.dx, b"dy": self.dy] + } + + fn tag_name(&self) -> &'static str { + "feOffset" + } +} diff --git a/crates/svg-filters/src/types/nodes/primitives/specular_lighting.rs b/crates/svg-filters/src/types/nodes/primitives/specular_lighting.rs new file mode 100644 index 0000000..16a6fcc --- /dev/null +++ b/crates/svg-filters/src/types/nodes/primitives/specular_lighting.rs @@ -0,0 +1,3 @@ +// TODO +#[derive(Debug)] +pub struct SpecularLighting; diff --git a/crates/svg-filters/src/types/nodes/primitives/tile.rs b/crates/svg-filters/src/types/nodes/primitives/tile.rs new file mode 100644 index 0000000..d83b65f --- /dev/null +++ b/crates/svg-filters/src/types/nodes/primitives/tile.rs @@ -0,0 +1,15 @@ +use super::WriteElement; + +/// [feTile](https://www.w3.org/TR/SVG11/filters.html#feTileElement) +#[derive(Debug)] +pub struct Tile; + +impl WriteElement for Tile { + fn attrs(&self) -> Vec { + Vec::new() + } + + fn tag_name(&self) -> &'static str { + "feTile" + } +} diff --git a/crates/svg-filters/src/types/nodes/primitives/turbulence.rs b/crates/svg-filters/src/types/nodes/primitives/turbulence.rs new file mode 100644 index 0000000..8fc4ae9 --- /dev/null +++ b/crates/svg-filters/src/types/nodes/primitives/turbulence.rs @@ -0,0 +1,42 @@ +use super::WriteElement; + +/// [feTurbulence](https://www.w3.org/TR/SVG11/filters.html#feTurbulenceElement) +#[derive(Debug)] +pub struct Turbulence { + pub base_frequency: (f32, f32), + pub num_octaves: u16, + pub seed: u32, + pub stitch_tiles: StitchTiles, + // attr name: type + pub noise_type: NoiseType, +} + +impl WriteElement for Turbulence { + #[allow(clippy::str_to_string, reason = "in macro invocation")] + fn attrs(&self) -> Vec { + let mut r = gen_attrs![b"baseFrequency": format!("{} {}", self.base_frequency.0, self.base_frequency.1)]; + gen_attrs![ + r; + self.num_octaves != 1 => b"numOctaves": self.num_octaves, + self.seed != 0 => b"seed": self.seed, + self.stitch_tiles != StitchTiles::NoStitch => b"stitchTiles": "stitch", + self.noise_type != NoiseType::Turbulence => b"type": "fractalNoise" + ]; + r + } + + fn tag_name(&self) -> &'static str { + "feTurbulence" + } +} + +#[derive(Debug, PartialEq, Eq, Clone, Copy)] +pub enum StitchTiles { + Stitch, + NoStitch, +} +#[derive(Debug, PartialEq, Eq, Clone, Copy)] +pub enum NoiseType { + Turbulence, + FractalNoise, +} diff --git a/crates/svg-filters/src/types/nodes/standard_input.rs b/crates/svg-filters/src/types/nodes/standard_input.rs new file mode 100644 index 0000000..3004e19 --- /dev/null +++ b/crates/svg-filters/src/types/nodes/standard_input.rs @@ -0,0 +1,11 @@ +/// [svg filter effect standard input](https://www.w3.org/TR/SVG11/filters.html#FilterPrimitiveInAttribute) +/// technically not a node, but for implementation simplicity... yeah +#[derive(Debug, Clone, Copy)] +pub enum StandardInput { + SourceGraphic, + SourceAlpha, + BackgroundImage, + BackgroundAlpha, + FillPaint, + StrokePaint, +} diff --git a/flake.lock b/flake.lock index fd2920d..9719001 100644 --- a/flake.lock +++ b/flake.lock @@ -1,18 +1,43 @@ { "nodes": { - "devenv": { + "cachix": { "inputs": { - "flake-compat": "flake-compat", - "nix": "nix", - "nixpkgs": "nixpkgs", + "devenv": "devenv_2", + "flake-compat": "flake-compat_2", + "nixpkgs": [ + "devenv", + "nixpkgs" + ], "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1704835383, - "narHash": "sha256-SoC0rYR9iHW0dVOEmxNEfa8vk9dTK86P5iXTgHafmwM=", + "lastModified": 1712055811, + "narHash": "sha256-7FcfMm5A/f02yyzuavJe06zLa9hcMHsagE28ADcmQvk=", + "owner": "cachix", + "repo": "cachix", + "rev": "02e38da89851ec7fec3356a5c04bc8349cae0e30", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "cachix", + "type": "github" + } + }, + "devenv": { + "inputs": { + "cachix": "cachix", + "flake-compat": "flake-compat_4", + "nix": "nix_2", + "nixpkgs": "nixpkgs_2", + "pre-commit-hooks": "pre-commit-hooks_2" + }, + "locked": { + "lastModified": 1712925466, + "narHash": "sha256-MJ6VxGNu/ftbn8SErJjBz80FUNXkZfcObHg/JP7wwAc=", "owner": "cachix", "repo": "devenv", - "rev": "18ef9849d1ecac7a9a7920eb4f2e4adcf67a8c3a", + "rev": "1af93652caf48bfeef6ba7d1cf59fc66e506e5c2", "type": "github" }, "original": { @@ -21,17 +46,48 @@ "type": "github" } }, + "devenv_2": { + "inputs": { + "flake-compat": [ + "devenv", + "cachix", + "flake-compat" + ], + "nix": "nix", + "nixpkgs": "nixpkgs", + "poetry2nix": "poetry2nix", + "pre-commit-hooks": [ + "devenv", + "cachix", + "pre-commit-hooks" + ] + }, + "locked": { + "lastModified": 1708704632, + "narHash": "sha256-w+dOIW60FKMaHI1q5714CSibk99JfYxm0CzTinYWr+Q=", + "owner": "cachix", + "repo": "devenv", + "rev": "2ee4450b0f4b95a1b90f2eb5ffea98b90e48c196", + "type": "github" + }, + "original": { + "owner": "cachix", + "ref": "python-rewrite", + "repo": "devenv", + "type": "github" + } + }, "fenix": { "inputs": { - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs_3", "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1704867811, - "narHash": "sha256-pG4O1vPpNSMjz7p/5x+/OH4tXC0thzAPbJ55kI/W5dU=", + "lastModified": 1712903033, + "narHash": "sha256-KcvsEm0h1mIwBHFAzWFBjGihnbf2fxpAaXOdVbUfAI4=", "owner": "nix-community", "repo": "fenix", - "rev": "93e89638c15512db65e931f26ce36edf8cfbb4a5", + "rev": "c739f83545e625227f4d0af7fe2a71e69931fa4c", "type": "github" }, "original": { @@ -56,16 +112,116 @@ "type": "github" } }, + "flake-compat_2": { + "flake": false, + "locked": { + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_3": { + "flake": false, + "locked": { + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_4": { + "flake": false, + "locked": { + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_5": { + "flake": false, + "locked": { + "lastModified": 1673956053, + "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, "flake-utils": { "inputs": { "systems": "systems" }, "locked": { - "lastModified": 1685518550, - "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=", + "lastModified": 1689068808, + "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=", "owner": "numtide", "repo": "flake-utils", - "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef", + "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_2": { + "inputs": { + "systems": "systems_2" + }, + "locked": { + "lastModified": 1701680307, + "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_3": { + "inputs": { + "systems": "systems_3" + }, + "locked": { + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "type": "github" }, "original": { @@ -78,16 +234,17 @@ "inputs": { "nixpkgs": [ "devenv", + "cachix", "pre-commit-hooks", "nixpkgs" ] }, "locked": { - "lastModified": 1660459072, - "narHash": "sha256-8DFJjXG8zqoONA1vXtgeKXy68KdJL5UaXR8NtVMUbx8=", + "lastModified": 1703887061, + "narHash": "sha256-gGPa9qWNc6eCXT/+Z5/zMkyYOuRZqeFZBDbopNZQkuY=", "owner": "hercules-ci", "repo": "gitignore.nix", - "rev": "a20de23b925fd8264fd7fad6454652e142fd7f73", + "rev": "43e1aa1308018f37118e34d3a9cb4f5e75dc11d5", "type": "github" }, "original": { @@ -96,53 +253,109 @@ "type": "github" } }, - "lowdown-src": { - "flake": false, + "gitignore_2": { + "inputs": { + "nixpkgs": [ + "devenv", + "pre-commit-hooks", + "nixpkgs" + ] + }, "locked": { - "lastModified": 1633514407, - "narHash": "sha256-Dw32tiMjdK9t3ETl5fzGrutQTzh2rufgZV4A/BbxuD4=", - "owner": "kristapsdz", - "repo": "lowdown", - "rev": "d2c2b44ff6c27b936ec27358a2653caaef8f73b8", + "lastModified": 1709087332, + "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", + "owner": "hercules-ci", + "repo": "gitignore.nix", + "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", "type": "github" }, "original": { - "owner": "kristapsdz", - "repo": "lowdown", + "owner": "hercules-ci", + "repo": "gitignore.nix", "type": "github" } }, "nix": { "inputs": { - "lowdown-src": "lowdown-src", + "flake-compat": "flake-compat", "nixpkgs": [ + "devenv", + "cachix", "devenv", "nixpkgs" ], "nixpkgs-regression": "nixpkgs-regression" }, "locked": { - "lastModified": 1676545802, - "narHash": "sha256-EK4rZ+Hd5hsvXnzSzk2ikhStJnD63odF7SzsQ8CuSPU=", + "lastModified": 1708577783, + "narHash": "sha256-92xq7eXlxIT5zFNccLpjiP7sdQqQI30Gyui2p/PfKZM=", "owner": "domenkozar", "repo": "nix", - "rev": "7c91803598ffbcfe4a55c44ac6d49b2cf07a527f", + "rev": "ecd0af0c1f56de32cbad14daa1d82a132bf298f8", "type": "github" }, "original": { "owner": "domenkozar", - "ref": "relaxed-flakes", + "ref": "devenv-2.21", + "repo": "nix", + "type": "github" + } + }, + "nix-github-actions": { + "inputs": { + "nixpkgs": [ + "devenv", + "cachix", + "devenv", + "poetry2nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1688870561, + "narHash": "sha256-4UYkifnPEw1nAzqqPOTL2MvWtm3sNGw1UTYTalkTcGY=", + "owner": "nix-community", + "repo": "nix-github-actions", + "rev": "165b1650b753316aa7f1787f3005a8d2da0f5301", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nix-github-actions", + "type": "github" + } + }, + "nix_2": { + "inputs": { + "flake-compat": "flake-compat_5", + "nixpkgs": [ + "devenv", + "nixpkgs" + ], + "nixpkgs-regression": "nixpkgs-regression_2" + }, + "locked": { + "lastModified": 1712911606, + "narHash": "sha256-BGvBhepCufsjcUkXnEEXhEVjwdJAwPglCC2+bInc794=", + "owner": "domenkozar", + "repo": "nix", + "rev": "b24a9318ea3f3600c1e24b4a00691ee912d4de12", + "type": "github" + }, + "original": { + "owner": "domenkozar", + "ref": "devenv-2.21", "repo": "nix", "type": "github" } }, "nixpkgs": { "locked": { - "lastModified": 1678875422, - "narHash": "sha256-T3o6NcQPwXjxJMn2shz86Chch4ljXgZn746c2caGxd8=", + "lastModified": 1692808169, + "narHash": "sha256-x9Opq06rIiwdwGeK2Ykj69dNc2IvUH1fY55Wm7atwrE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "126f49a01de5b7e35a43fd43f891ecf6d3a51459", + "rev": "9201b5ff357e781bf014d0330d18555695df7ba8", "type": "github" }, "original": { @@ -168,45 +381,93 @@ "type": "github" } }, - "nixpkgs-stable": { + "nixpkgs-regression_2": { "locked": { - "lastModified": 1685801374, - "narHash": "sha256-otaSUoFEMM+LjBI1XL/xGB5ao6IwnZOXc47qhIgJe8U=", + "lastModified": 1643052045, + "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c37ca420157f4abc31e26f436c1145f8951ff373", + "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-23.05", + "repo": "nixpkgs", + "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", + "type": "github" + } + }, + "nixpkgs-stable": { + "locked": { + "lastModified": 1704874635, + "narHash": "sha256-YWuCrtsty5vVZvu+7BchAxmcYzTMfolSPP5io8+WYCg=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "3dc440faeee9e889fe2d1b4d25ad0f430d449356", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-23.11", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-stable_2": { + "locked": { + "lastModified": 1710695816, + "narHash": "sha256-3Eh7fhEID17pv9ZxrPwCLfqXnYP006RKzSs0JptsN84=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "614b4613980a522ba49f0d194531beddbb7220d3", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-23.11", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_2": { "locked": { - "lastModified": 1704538339, - "narHash": "sha256-1734d3mQuux9ySvwf6axRWZRBhtcZA9Q8eftD6EZg6U=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "46ae0210ce163b3cba6c7da08840c1d63de9c701", + "lastModified": 1710796454, + "narHash": "sha256-lQlICw60RhH8sHTDD/tJiiJrlAfNn8FDI9c+7G2F0SE=", + "owner": "cachix", + "repo": "devenv-nixpkgs", + "rev": "06fb0f1c643aee3ae6838dda3b37ef0abc3c763b", "type": "github" }, "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", + "owner": "cachix", + "ref": "rolling", + "repo": "devenv-nixpkgs", "type": "github" } }, "nixpkgs_3": { "locked": { - "lastModified": 1704722960, - "narHash": "sha256-mKGJ3sPsT6//s+Knglai5YflJUF2DGj7Ai6Ynopz0kI=", + "lastModified": 1712791164, + "narHash": "sha256-3sbWO1mbpWsLepZGbWaMovSO7ndZeFqDSdX0hZ9nVyw=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "1042fd8b148a9105f3c0aca3a6177fd1d9360ba5", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_4": { + "locked": { + "lastModified": 1712791164, + "narHash": "sha256-3sbWO1mbpWsLepZGbWaMovSO7ndZeFqDSdX0hZ9nVyw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "317484b1ead87b9c1b8ac5261a8d2dd748a0492d", + "rev": "1042fd8b148a9105f3c0aca3a6177fd1d9360ba5", "type": "github" }, "original": { @@ -216,26 +477,77 @@ "type": "github" } }, + "poetry2nix": { + "inputs": { + "flake-utils": "flake-utils", + "nix-github-actions": "nix-github-actions", + "nixpkgs": [ + "devenv", + "cachix", + "devenv", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1692876271, + "narHash": "sha256-IXfZEkI0Mal5y1jr6IRWMqK8GW2/f28xJenZIPQqkY0=", + "owner": "nix-community", + "repo": "poetry2nix", + "rev": "d5006be9c2c2417dafb2e2e5034d83fabd207ee3", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "poetry2nix", + "type": "github" + } + }, "pre-commit-hooks": { "inputs": { - "flake-compat": [ - "devenv", - "flake-compat" - ], - "flake-utils": "flake-utils", + "flake-compat": "flake-compat_3", + "flake-utils": "flake-utils_2", "gitignore": "gitignore", "nixpkgs": [ "devenv", + "cachix", "nixpkgs" ], "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1704725188, - "narHash": "sha256-qq8NbkhRZF1vVYQFt1s8Mbgo8knj+83+QlL5LBnYGpI=", + "lastModified": 1708018599, + "narHash": "sha256-M+Ng6+SePmA8g06CmUZWi1AjG2tFBX9WCXElBHEKnyM=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "ea96f0c05924341c551a797aaba8126334c505d2", + "rev": "5df5a70ad7575f6601d91f0efec95dd9bc619431", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "pre-commit-hooks.nix", + "type": "github" + } + }, + "pre-commit-hooks_2": { + "inputs": { + "flake-compat": [ + "devenv", + "flake-compat" + ], + "flake-utils": "flake-utils_3", + "gitignore": "gitignore_2", + "nixpkgs": [ + "devenv", + "nixpkgs" + ], + "nixpkgs-stable": "nixpkgs-stable_2" + }, + "locked": { + "lastModified": 1712897695, + "narHash": "sha256-nMirxrGteNAl9sWiOhoN5tIHyjBbVi5e2tgZUgZlK3Y=", + "owner": "cachix", + "repo": "pre-commit-hooks.nix", + "rev": "40e6053ecb65fcbf12863338a6dcefb3f55f1bf8", "type": "github" }, "original": { @@ -248,18 +560,18 @@ "inputs": { "devenv": "devenv", "fenix": "fenix", - "nixpkgs": "nixpkgs_3", - "systems": "systems_2" + "nixpkgs": "nixpkgs_4", + "systems": "systems_4" } }, "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1704833483, - "narHash": "sha256-Ox01mpYmjapNYaqOu4fMS/4Ma9NLd2rVNz6d4rJmcf4=", + "lastModified": 1712818880, + "narHash": "sha256-VDxsvgj/bNypHq48tQWtc3VRbWvzlFjzKf9ZZIVO10Y=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "ae6e73772432cfe35bb0ff6de6fdcfa908642b67", + "rev": "657b33b0cb9bd49085202e91ad5b4676532c9140", "type": "github" }, "original": { @@ -298,6 +610,36 @@ "repo": "default", "type": "github" } + }, + "systems_3": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_4": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index da80ec2..8dd48aa 100644 --- a/flake.nix +++ b/flake.nix @@ -11,41 +11,55 @@ extra-substituters = "https://devenv.cachix.org"; }; - outputs = { self, nixpkgs, devenv, systems, ... } @ inputs: - let - forEachSystem = nixpkgs.lib.genAttrs (import systems); - in - { - devShells = forEachSystem - (system: - let - pkgs = nixpkgs.legacyPackages.${system}; - in - { - default = devenv.lib.mkShell { - inherit inputs pkgs; - modules = [ - ({pkgs, config, ...}: { - languages.rust = { - enable = true; - channel = "nightly"; - }; + outputs = { + self, + nixpkgs, + devenv, + fenix, + systems, + ... + } @ inputs: let + forEachSystem = nixpkgs.lib.genAttrs (import systems); + in { + devShells = + forEachSystem + (system: let + pkgs = nixpkgs.legacyPackages.${system}; + toolchain = with fenix.packages.${system}; + combine [ + complete.toolchain + ]; + in { + default = devenv.lib.mkShell { + inherit inputs pkgs; + modules = [ + ({ + pkgs, + config, + ... + }: { + pre-commit.hooks = { + clippy.enable = false; + rustfmt.enable = true; + }; - pre-commit.hooks = { - clippy.enable = true; - rustfmt.enable = true; - }; - - packages = with pkgs; [ - just nushell - ripgrep - typst typst-lsp - mold - cargo-nextest cargo-watch - ]; - }) + env = { + RUST_BACKTRACE = 1; + }; + packages = with pkgs; [ + just + nushell + ripgrep + typst + typst-lsp + mold + cargo-nextest + cargo-watch + toolchain ]; - }; - }); - }; + }) + ]; + }; + }); + }; } diff --git a/testfiles/config.json b/testfiles/config.json new file mode 100644 index 0000000..3456c5c --- /dev/null +++ b/testfiles/config.json @@ -0,0 +1,4 @@ +{ + "example_value": "42", + "no_startup_message": true +} \ No newline at end of file diff --git a/testfiles/config.ron b/testfiles/config.ron new file mode 100644 index 0000000..7b47189 --- /dev/null +++ b/testfiles/config.ron @@ -0,0 +1,4 @@ +( + example_value: 42 + no_startup_message: false, +) diff --git a/testfiles/testproj/hello.owo b/testfiles/testproj/hello.owo new file mode 100644 index 0000000..f2fe209 --- /dev/null +++ b/testfiles/testproj/hello.owo @@ -0,0 +1,3 @@ +mod meow; + +def broken diff --git a/testfiles/testproj/hello/meow.owo b/testfiles/testproj/hello/meow.owo new file mode 100644 index 0000000..3140a4a --- /dev/null +++ b/testfiles/testproj/hello/meow.owo @@ -0,0 +1,4 @@ +mod mrawr {} +mod mrow { + def gay = ; +} diff --git a/testfiles/testproj/test.owo b/testfiles/testproj/test.owo new file mode 100644 index 0000000..13bb5e7 --- /dev/null +++ b/testfiles/testproj/test.owo @@ -0,0 +1,8 @@ +mod hello; +mod world { + mod meow {} + mod uwu { + mod test {} + mod meow {} + } +} diff --git a/testfiles/testproj/uwu.owo b/testfiles/testproj/uwu.owo new file mode 100644 index 0000000..1a6b5d1 --- /dev/null +++ b/testfiles/testproj/uwu.owo @@ -0,0 +1 @@ +mod meow {}