diff --git a/Cargo.lock b/Cargo.lock index 5bb56ffa..7f0f4b1e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -75,23 +75,22 @@ checksum = "d3fb67a6e08acf24fdeccbac2cb6ac4305825bd1f117462e0e6f2f193345ad56" [[package]] name = "attribute-derive" -version = "0.10.5" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05832cdddc8f2650cc2cc187cc2e952b8c133a48eb055f35211f61ee81502d77" +checksum = "d2f9ef7a68684657ce9da341c934c73b63df7a3585a61e366d84c84ed5d3d167" dependencies = [ "attribute-derive-macro", - "derive-where", "manyhow", "proc-macro2", "quote", - "syn 2.0.119", + "syn 3.0.4", ] [[package]] name = "attribute-derive-macro" -version = "0.10.5" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a7cdbbd4bd005c5d3e2e9c885e6fa575db4f4a3572335b974d8db853b6beb61" +checksum = "300d426e5e73549125bb8e4649bdd5508f82c94ddf898fb0517246e71dfb8e98" dependencies = [ "collection_literals", "interpolator", @@ -100,7 +99,7 @@ dependencies = [ "proc-macro2", "quote", "quote-use", - "syn 2.0.119", + "syn 3.0.4", ] [[package]] @@ -128,7 +127,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6bb31b46c14244e20ee9984b11bf5c992b91fb6939fea616e3512c8baecdbe5f" dependencies = [ "memchr", - "regex-automata", "serde_core", ] @@ -177,9 +175,9 @@ checksum = "f079e83a288787bcd14a6aea84cee5c87a67c5a3e660c30f557a3d24761b3527" [[package]] name = "char_str" -version = "0.0.2" +version = "0.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "576ba56f6ca18ebb069d0d07260407171712aff4dfe15ee3f8982dc16a455bcf" +checksum = "c9cba78a5abb515610e10af297615434b019755b5d7be14e559ff5340dff50c4" dependencies = [ "castaway", "get-size2", @@ -238,14 +236,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7cd812cc2bc1d69d4764bd80df88b4317eaef9e773c75226407d9bc0876b211c" [[package]] -name = "derive-where" -version = "1.6.1" +name = "displaydoc" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d08b3a0bcc0d079199cd476b2cae8435016ec11d1c0986c6901c5ac223041534" +checksum = "c6232dd377dcc64799954cbd3a9bb882e9cdc1308ccd87b1c098f1fb2eaf82a8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.119", + "syn 3.0.4", ] [[package]] @@ -355,20 +353,20 @@ dependencies = [ [[package]] name = "get-size-derive2" -version = "0.10.3" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c736d226c32e496b8377813b52269e11ad3a48d8373b68862d0364f04fd1229d" +checksum = "28f0daa179069133df60523e0f59d0a6bd2d3db9ccae01b630896d269c4a802e" dependencies = [ "attribute-derive", "quote", - "syn 2.0.119", + "syn 3.0.4", ] [[package]] name = "get-size2" -version = "0.10.3" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b411f34418305908ab15a82ff78958c2a9aee9a272b2a2e663836b20a4e4b9d3" +checksum = "050a5d07359ebfac7f0b74916d94cfa30575e45fdc7e9bfbb0f76d5d4203325a" dependencies = [ "compact_str", "get-size-derive2", @@ -455,6 +453,69 @@ dependencies = [ "cc", ] +[[package]] +name = "icu_collections" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa68d21081c4a05d5a901a1c62add574c77048b6a1c67be3b50ce0b60d4ca513" +dependencies = [ + "displaydoc", + "potential_utf", + "utf8_iter", + "yoke", + "zerofrom", + "zerovec", +] + +[[package]] +name = "icu_locale_core" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d56e28588da92eee5c3201a6eff33fabdd49b62269c8938d4ff050ce4d900deb" +dependencies = [ + "displaydoc", + "litemap", + "tinystr", + "writeable", + "zerovec", +] + +[[package]] +name = "icu_properties" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e7ca276ad3145661a65914e6daf131ca5120cd3dcee8f8f3214b8875184a148" +dependencies = [ + "displaydoc", + "icu_collections", + "icu_locale_core", + "icu_properties_data", + "icu_provider", + "zerotrie", + "zerovec", +] + +[[package]] +name = "icu_properties_data" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e590f038c1464a96894fd6d10127e90a8be4509f56ff7ecef851b15cee0b7caa" + +[[package]] +name = "icu_provider" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d27bbb9d3abbefac45d55f647c9de1d44aafcd1186eb91879afef17c396c3e73" +dependencies = [ + "displaydoc", + "icu_locale_core", + "writeable", + "yoke", + "zerofrom", + "zerotrie", + "zerovec", +] + [[package]] name = "indexmap" version = "2.14.1" @@ -550,6 +611,12 @@ version = "0.2.189" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3eaf3ede3fee6db1a4c2ee091bf8a8b4dccdc6d17f656fb07896ee72867612f2" +[[package]] +name = "litemap" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "47d9d19d1d6efa0109d2f65ff4c85cddd50bd572e5a00127ab10987290bcefae" + [[package]] name = "log" version = "0.4.34" @@ -561,21 +628,21 @@ dependencies = [ [[package]] name = "manyhow" -version = "0.11.4" +version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b33efb3ca6d3b07393750d4030418d594ab1139cee518f0dc88db70fec873587" +checksum = "f1704b073316272a6785b70599f91f73b49022c2e290b065591ee6b9109ed8c7" dependencies = [ "manyhow-macros", "proc-macro2", "quote", - "syn 2.0.119", + "syn 3.0.4", ] [[package]] name = "manyhow-macros" -version = "0.11.4" +version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46fce34d199b78b6e6073abf984c9cf5fd3e9330145a93ee0738a7443e371495" +checksum = "31601db71f1f5fb6f831a18aa3052d13a62528ee4f2cba7e8c9a5e258d953725" dependencies = [ "proc-macro-utils", "proc-macro2", @@ -724,9 +791,9 @@ checksum = "9f7c3e4beb33f85d45ae3e3a1792185706c8e16d043238c593331cc7cd313b50" [[package]] name = "openjd-expr" -version = "0.10.1" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cb32de68f383134ea86892ad7729f44835b0365c43ed4fb67314d44bf70e9cf" +checksum = "febc1f6e714779847dfbb7c0754c274febc286a668076267612a8afa3db2fcee" dependencies = [ "regex", "regex-syntax", @@ -741,9 +808,9 @@ dependencies = [ [[package]] name = "openjd-model" -version = "0.11.0" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac98b9796bc097b1442af06cd859c192810740a5068c41aae9e51bb3ec409d82" +checksum = "5e8a7a5c765e901c5ba5e38b01775bdb9064fd9a3161eae1f241dbd66200bae9" dependencies = [ "indexmap", "openjd-expr", @@ -773,9 +840,9 @@ dependencies = [ [[package]] name = "openjd-sessions" -version = "0.7.3" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d62db42cea637595af663439d1b5604a40d0c63699ee785cd193f982a23ad18a" +checksum = "f86b899ad49220c5c57a223d57f8adf421eb427ad6013f8047d07806931eb8ff" dependencies = [ "bitflags", "futures-util", @@ -873,6 +940,15 @@ dependencies = [ "portable-atomic", ] +[[package]] +name = "potential_utf" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d83eb9bc6d8e5cf568e7a1101d60ee05e81ed50ea106026f3d18deeb046d7661" +dependencies = [ + "zerovec", +] + [[package]] name = "powerfmt" version = "0.2.0" @@ -1037,9 +1113,9 @@ dependencies = [ [[package]] name = "quote-use" -version = "0.8.4" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9619db1197b497a36178cfc736dc96b271fe918875fbf1344c436a7e93d0321e" +checksum = "48356e493823dc3c1d7e9fc7b3ff204ecec48afbdd718fc4134091b88eb63f3d" dependencies = [ "quote", "quote-use-macros", @@ -1047,14 +1123,14 @@ dependencies = [ [[package]] name = "quote-use-macros" -version = "0.8.4" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82ebfb7faafadc06a7ab141a6f67bcfb24cb8beb158c6fe933f2f035afa99f35" +checksum = "8cf1c5de6a7cc231c71e03c77aa4c7019097859ea7029156b54d2894a8430704" dependencies = [ "proc-macro-utils", "proc-macro2", "quote", - "syn 2.0.119", + "syn 3.0.4", ] [[package]] @@ -1199,9 +1275,9 @@ dependencies = [ [[package]] name = "rustpython-ruff_python_ast" -version = "0.16.5" +version = "0.16.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc19eeb4cfa2c35428143693eadf85ee78816f22a829298593581a56700c0a21" +checksum = "5b7ffeb85f9a68c461d538839c79548584768df08f2d68cb1ee693be697e0355" dependencies = [ "aho-corasick", "arrayvec", @@ -1221,14 +1297,16 @@ dependencies = [ [[package]] name = "rustpython-ruff_python_parser" -version = "0.16.5" +version = "0.16.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "480eec9ac4dda77b6724f0c9a54a81d3c57868d6a707c3d7c5133fd83c933f66" +checksum = "7c9729e35cac02839c7a67aaccfea3eba32032f7aeacca2e82ad79e8d7b7fd95" dependencies = [ "bitflags", "bstr", "drop_bomb", "get-size2", + "hashbrown", + "icu_properties", "memchr", "rustc-hash 2.1.3", "rustpython-ruff_python_ast", @@ -1244,22 +1322,24 @@ dependencies = [ [[package]] name = "rustpython-ruff_python_trivia" -version = "0.16.5" +version = "0.16.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d69a5d9bb610a76bee05d23adce0de55f0fa06f251c0e1c7f7a0c625a366a58" +checksum = "764f43ea060f888164fbd360b0e1a36f2a35f5c03def85407bab7039fc62a645" dependencies = [ "itertools 0.15.0", + "memchr", "rustc-hash 2.1.3", "rustpython-ruff_source_file", "rustpython-ruff_text_size", "unicode-ident", + "unicode-normalization", ] [[package]] name = "rustpython-ruff_source_file" -version = "0.16.5" +version = "0.16.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3aa9c91c8a4e86bf0fa8a67aec284fa6c0c533cdefb900b08584be15748c606" +checksum = "cfe26430c3f2eadb40524b6df7ac9a3970dd2b58f921b01ed75df0121e332fad" dependencies = [ "memchr", "rustpython-ruff_text_size", @@ -1267,9 +1347,9 @@ dependencies = [ [[package]] name = "rustpython-ruff_text_size" -version = "0.16.5" +version = "0.16.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fedbd1af4f91cd828185123d95119662db9c4a0b21c02b695783d74360d4f46" +checksum = "5e5377a04f2855030600b93a05754242950ea9b070507ef9aef67965a52eeb09" dependencies = [ "get-size2", ] @@ -1398,6 +1478,12 @@ version = "1.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8ed6a63f02c8539c91a8685a86f4099661ba3da017932f6ebbea6de3f0fa7c90" +[[package]] +name = "stable_deref_trait" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ce2be8dc25455e1f91df71bfa12ad37d7af1092ae736f3a6cd0e37bc7810596" + [[package]] name = "stacker" version = "0.1.25" @@ -1518,6 +1604,17 @@ dependencies = [ "unicode-ident", ] +[[package]] +name = "synstructure" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "901704edd0dfe137f1987838ee4f259e4e063c31371bdb423f7ae38ec6f77f02" +dependencies = [ + "proc-macro2", + "quote", + "syn 3.0.4", +] + [[package]] name = "target-lexicon" version = "0.13.5" @@ -1578,6 +1675,16 @@ dependencies = [ "crunchy", ] +[[package]] +name = "tinystr" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1e27c91459209c2986af3dcf603a5a74a4368754ce37414f59acc971167f643" +dependencies = [ + "displaydoc", + "zerovec", +] + [[package]] name = "tinyvec" version = "1.12.0" @@ -1772,6 +1879,12 @@ dependencies = [ "rand", ] +[[package]] +name = "utf8_iter" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" + [[package]] name = "uuid" version = "1.26.0" @@ -1995,6 +2108,35 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "23b97319f7b8343df12cc98938e5c3eb436064524c8d2b4e30a1d3a36eecdf81" +[[package]] +name = "writeable" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ad82d2a33cdc9674dc7465672f271e096168fcdbe0f799d9e6db8c5892679dc" + +[[package]] +name = "yoke" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "709fe23a0424b6a435d82152b1bd3fdfb0833487d5fa90d05d42762a9891fef5" +dependencies = [ + "stable_deref_trait", + "yoke-derive", + "zerofrom", +] + +[[package]] +name = "yoke-derive" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec8ebde2db3681e8c9980cc27822030e68752690ddfa9473e739aeb4dbde6d71" +dependencies = [ + "proc-macro2", + "quote", + "syn 3.0.4", + "synstructure", +] + [[package]] name = "zerocopy" version = "0.8.56" @@ -2015,6 +2157,60 @@ dependencies = [ "syn 2.0.119", ] +[[package]] +name = "zerofrom" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ec05a11813ea801ff6d75110ad09cd0824ddba17dfe17128ea0d5f68e6c5272" +dependencies = [ + "zerofrom-derive", +] + +[[package]] +name = "zerofrom-derive" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f75b4683f6c7f45248d4d64056a24298c6281e0993356d7d1b4a1a962ef10d4a" +dependencies = [ + "proc-macro2", + "quote", + "syn 3.0.4", + "synstructure", +] + +[[package]] +name = "zerotrie" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ea269c3bd32f0a32c321907a2ae912ba6f4649bb0fc764a15627e99a7095a3f" +dependencies = [ + "displaydoc", + "yoke", + "zerofrom", +] + +[[package]] +name = "zerovec" +version = "0.11.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb0464e17806c1d976d5cba29399c7f08e516e279e2ba493f63123b5fca67dd8" +dependencies = [ + "yoke", + "zerofrom", + "zerovec-derive", +] + +[[package]] +name = "zerovec-derive" +version = "0.11.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34df6fc39dbd26ddc9c10e6a2984476e13acce22e64e4487636ef494369225da" +dependencies = [ + "proc-macro2", + "quote", + "syn 3.0.4", +] + [[package]] name = "zmij" version = "1.0.23" diff --git a/THIRD-PARTY-LICENSES.txt b/THIRD-PARTY-LICENSES.txt index f6e01f48..34294a02 100644 --- a/THIRD-PARTY-LICENSES.txt +++ b/THIRD-PARTY-LICENSES.txt @@ -24,7 +24,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ------ -** pydantic; version 2.13.5 -- https://pypi.org/project/pydantic/ +** pydantic; version 2.14.1 -- https://pypi.org/project/pydantic/ The MIT License (MIT) Copyright (c) 2017 to present Pydantic Services Inc. and individual contributors. @@ -48,7 +48,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ------ -** pydantic_core; version 2.46.5 -- https://pypi.org/project/pydantic_core/ +** pydantic_core; version 2.50.1 -- https://pypi.org/project/pydantic_core/ The MIT License (MIT) Copyright (c) 2022 Samuel Colvin @@ -607,11 +607,11 @@ PERFORMANCE OF THIS SOFTWARE. limitations under the License. ------ -** derive-where; version 1.6.1 -- https://crates.io/crates/derive-where ** encoding_rs; version 0.8.35 -- https://crates.io/crates/encoding_rs ** nohash-hasher; version 0.2.0 -- https://crates.io/crates/nohash-hasher ** static_assertions; version 1.1.0 -- https://crates.io/crates/static_assertions ** tinyvec; version 1.12.0 -- https://crates.io/crates/tinyvec +** utf8_iter; version 1.0.4 -- https://crates.io/crates/utf8_iter Apache License Version 2.0, January 2004 @@ -1041,9 +1041,9 @@ Software. ------ -** attribute-derive; version 0.10.5 -- https://crates.io/crates/attribute-derive +** attribute-derive; version 0.11.0 -- https://crates.io/crates/attribute-derive ** interpolator; version 0.5.0 -- https://crates.io/crates/interpolator -** manyhow; version 0.11.4 -- https://crates.io/crates/manyhow +** manyhow; version 0.14.1 -- https://crates.io/crates/manyhow ** proc-macro-utils; version 0.10.0 -- https://crates.io/crates/proc-macro-utils Apache License Version 2.0, January 2004 @@ -2094,6 +2094,7 @@ limitations under the License. ** bitflags; version 2.13.1 -- https://crates.io/crates/bitflags ** bstr; version 1.13.1 -- https://crates.io/crates/bstr ** cfg-if; version 1.0.4 -- https://crates.io/crates/cfg-if +** displaydoc; version 0.2.7 -- https://crates.io/crates/displaydoc ** drop_bomb; version 0.1.5 -- https://crates.io/crates/drop_bomb ** either; version 1.18.0 -- https://crates.io/crates/either ** encoding_rs_io; version 0.1.8 -- https://crates.io/crates/encoding_rs_io @@ -2113,6 +2114,7 @@ limitations under the License. ** regex; version 1.13.1 -- https://crates.io/crates/regex ** signal-hook-registry; version 1.4.8 -- https://crates.io/crates/signal-hook-registry ** smallvec; version 1.15.2 -- https://crates.io/crates/smallvec +** stable_deref_trait; version 1.2.1 -- https://crates.io/crates/stable_deref_trait ** stacker; version 0.1.25 -- https://crates.io/crates/stacker ** unicode-normalization; version 0.1.25 -- https://crates.io/crates/unicode-normalization ** unicode-width; version 0.2.2 -- https://crates.io/crates/unicode-width @@ -2735,15 +2737,15 @@ limitations under the License. ------ ** arraydeque; version 0.5.1 -- https://crates.io/crates/arraydeque -** get-size-derive2; version 0.10.3 -- https://crates.io/crates/get-size-derive2 -** get-size2; version 0.10.3 -- https://crates.io/crates/get-size2 +** get-size-derive2; version 0.11.1 -- https://crates.io/crates/get-size-derive2 +** get-size2; version 0.11.1 -- https://crates.io/crates/get-size2 ** granit-parser; version 1.2.0 -- https://crates.io/crates/granit-parser ** itoa; version 1.0.18 -- https://crates.io/crates/itoa ** libc; version 0.2.189 -- https://crates.io/crates/libc -** manyhow-macros; version 0.11.4 -- https://crates.io/crates/manyhow-macros -** openjd-expr; version 0.10.1 -- https://crates.io/crates/openjd-expr -** openjd-model; version 0.11.0 -- https://crates.io/crates/openjd-model -** openjd-sessions; version 0.7.3 -- https://crates.io/crates/openjd-sessions +** manyhow-macros; version 0.14.1 -- https://crates.io/crates/manyhow-macros +** openjd-expr; version 0.12.0 -- https://crates.io/crates/openjd-expr +** openjd-model; version 0.13.0 -- https://crates.io/crates/openjd-model +** openjd-sessions; version 0.8.1 -- https://crates.io/crates/openjd-sessions ** pin-project-lite; version 0.2.17 -- https://crates.io/crates/pin-project-lite ** portable-atomic; version 1.15.0 -- https://crates.io/crates/portable-atomic ** proc-macro2; version 1.0.107 -- https://crates.io/crates/proc-macro2 @@ -3013,6 +3015,36 @@ IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +------ +** quote-use-macros; version 0.9.0 -- https://crates.io/crates/quote-use-macros +** quote-use; version 0.9.0 -- https://crates.io/crates/quote-use +Copyright (c) Roland Fredenhagen + +Permission is hereby granted, free of charge, to any +person obtaining a copy of this software and associated +documentation files (the "Software"), to deal in the +Software without restriction, including without +limitation the rights to use, copy, modify, merge, +publish, distribute, sublicense, and/or sell copies of +the Software, and to permit persons to whom the Software +is furnished to do so, subject to the following +conditions: + +The above copyright notice and this permission notice +shall be included in all copies or substantial portions +of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF +ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED +TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A +PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT +SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR +IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +DEALINGS IN THE SOFTWARE. + + ------ ** collection_literals; version 1.0.3 -- https://crates.io/crates/collection_literals Copyright (c) The collection_literals Contributors @@ -3042,6 +3074,17 @@ IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +------ +** synstructure; version 0.14.0 -- https://crates.io/crates/synstructure +Copyright 2016 Nika Layzell + +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + + ------ ** tokio-macros; version 2.7.2 -- https://crates.io/crates/tokio-macros MIT License @@ -3119,7 +3162,7 @@ SOFTWARE. ------ -** attribute-derive-macro; version 0.10.5 -- https://crates.io/crates/attribute-derive-macro +** attribute-derive-macro; version 0.11.0 -- https://crates.io/crates/attribute-derive-macro MIT License Copyright (c) 2022 Roland Fredenhagen @@ -3144,7 +3187,7 @@ SOFTWARE. ------ -** char_str; version 0.0.2 -- https://crates.io/crates/char_str +** char_str; version 0.0.4 -- https://crates.io/crates/char_str MIT License Copyright (c) 2024 ryota2357 @@ -3169,13 +3212,11 @@ SOFTWARE. ------ -** quote-use-macros; version 0.8.4 -- https://crates.io/crates/quote-use-macros -** quote-use; version 0.8.4 -- https://crates.io/crates/quote-use -** rustpython-ruff_python_ast; version 0.16.5 -- https://crates.io/crates/rustpython-ruff_python_ast -** rustpython-ruff_python_parser; version 0.16.5 -- https://crates.io/crates/rustpython-ruff_python_parser -** rustpython-ruff_python_trivia; version 0.16.5 -- https://crates.io/crates/rustpython-ruff_python_trivia -** rustpython-ruff_source_file; version 0.16.5 -- https://crates.io/crates/rustpython-ruff_source_file -** rustpython-ruff_text_size; version 0.16.5 -- https://crates.io/crates/rustpython-ruff_text_size +** rustpython-ruff_python_ast; version 0.16.10 -- https://crates.io/crates/rustpython-ruff_python_ast +** rustpython-ruff_python_parser; version 0.16.10 -- https://crates.io/crates/rustpython-ruff_python_parser +** rustpython-ruff_python_trivia; version 0.16.10 -- https://crates.io/crates/rustpython-ruff_python_trivia +** rustpython-ruff_source_file; version 0.16.10 -- https://crates.io/crates/rustpython-ruff_source_file +** rustpython-ruff_text_size; version 0.16.10 -- https://crates.io/crates/rustpython-ruff_text_size MIT License Copyright (c) @@ -3368,6 +3409,71 @@ dealings in these Data Files or Software without prior written authorization of the copyright holder. +------ +** icu_collections; version 2.3.0 -- https://crates.io/crates/icu_collections +** icu_locale_core; version 2.3.0 -- https://crates.io/crates/icu_locale_core +** icu_properties; version 2.3.0 -- https://crates.io/crates/icu_properties +** icu_properties_data; version 2.3.0 -- https://crates.io/crates/icu_properties_data +** icu_provider; version 2.3.1 -- https://crates.io/crates/icu_provider +** litemap; version 0.8.3 -- https://crates.io/crates/litemap +** potential_utf; version 0.1.6 -- https://crates.io/crates/potential_utf +** tinystr; version 0.8.4 -- https://crates.io/crates/tinystr +** writeable; version 0.6.4 -- https://crates.io/crates/writeable +** yoke-derive; version 0.8.4 -- https://crates.io/crates/yoke-derive +** yoke; version 0.8.3 -- https://crates.io/crates/yoke +** zerofrom-derive; version 0.1.8 -- https://crates.io/crates/zerofrom-derive +** zerofrom; version 0.1.8 -- https://crates.io/crates/zerofrom +** zerotrie; version 0.2.5 -- https://crates.io/crates/zerotrie +** zerovec-derive; version 0.11.6 -- https://crates.io/crates/zerovec-derive +** zerovec; version 0.11.8 -- https://crates.io/crates/zerovec +UNICODE LICENSE V3 + +COPYRIGHT AND PERMISSION NOTICE + +Copyright © 2020-2024 Unicode, Inc. + +NOTICE TO USER: Carefully read the following legal agreement. BY +DOWNLOADING, INSTALLING, COPYING OR OTHERWISE USING DATA FILES, AND/OR +SOFTWARE, YOU UNEQUIVOCALLY ACCEPT, AND AGREE TO BE BOUND BY, ALL OF THE +TERMS AND CONDITIONS OF THIS AGREEMENT. IF YOU DO NOT AGREE, DO NOT +DOWNLOAD, INSTALL, COPY, DISTRIBUTE OR USE THE DATA FILES OR SOFTWARE. + +Permission is hereby granted, free of charge, to any person obtaining a +copy of data files and any associated documentation (the "Data Files") or +software and any associated documentation (the "Software") to deal in the +Data Files or Software without restriction, including without limitation +the rights to use, copy, modify, merge, publish, distribute, and/or sell +copies of the Data Files or Software, and to permit persons to whom the +Data Files or Software are furnished to do so, provided that either (a) +this copyright and permission notice appear with all copies of the Data +Files or Software, or (b) this copyright and permission notice appear in +associated Documentation. + +THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY +KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF +THIRD PARTY RIGHTS. + +IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS NOTICE +BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, +OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, +WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, +ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THE DATA +FILES OR SOFTWARE. + +Except as contained in this notice, the name of a copyright holder shall +not be used in advertising or otherwise to promote the sale, use or other +dealings in these Data Files or Software without prior written +authorization of the copyright holder. + +SPDX-License-Identifier: Unicode-3.0 + +— + +Portions of ICU4X may have been adapted from ICU4C and/or ICU4J. +ICU 1.8.1 to ICU 57.1 © 1995-2016 International Business Machines Corporation and others. + + ------ ** unicode_names2; version 1.3.0 -- https://crates.io/crates/unicode_names2 UNICODE, INC. LICENSE AGREEMENT - DATA FILES AND SOFTWARE diff --git a/rust-bindings/Cargo.toml b/rust-bindings/Cargo.toml index 56abf14d..28cc6c4b 100644 --- a/rust-bindings/Cargo.toml +++ b/rust-bindings/Cargo.toml @@ -12,9 +12,9 @@ name = "_openjd_rs" crate-type = ["cdylib", "rlib"] [dependencies] -openjd-expr = "0.10.1" -openjd-model = "0.11.0" -openjd-sessions = "0.7.3" +openjd-expr = "0.12.0" +openjd-model = "0.13.0" +openjd-sessions = "0.8.1" tokio = { version = "1", features = ["rt-multi-thread"] } uuid = { version = "1", features = ["v4"] } serde_json = "1" diff --git a/src/openjd/model/_internal/_variable_reference_validation.py b/src/openjd/model/_internal/_variable_reference_validation.py index e34a4565..caf14f1b 100644 --- a/src/openjd/model/_internal/_variable_reference_validation.py +++ b/src/openjd/model/_internal/_variable_reference_validation.py @@ -236,7 +236,7 @@ def _internal_deepcopy(value: Any) -> Any: def _validate_model_template_variable_references( - model: Type, + model: Any, # a field annotation: a class, a Union, or a generic alias value: Any, current_scope: ResolutionScope, symbol_prefix: str, @@ -831,7 +831,7 @@ def _symbol_expr_type(value: dict, raw: bool) -> Optional[str]: def _collect_variable_definitions( # noqa: C901 (suppress: too complex) - model: Type, + model: Any, # a field annotation: a class, a Union, or a generic alias value: Any, current_scope: ResolutionScope, symbol_prefix: str, diff --git a/test/openjd/expr/test_error_formatting.py b/test/openjd/expr/test_error_formatting.py index 32e1a320..8268fc56 100644 --- a/test/openjd/expr/test_error_formatting.py +++ b/test/openjd/expr/test_error_formatting.py @@ -308,8 +308,9 @@ def test_unclosed_paren(self): """Unclosed parenthesis shows caret spanning the expression.""" with pytest.raises(ExpressionError) as exc_info: evaluate_expression("(1 + 2", values=SymbolTable()) + # CPython's wording since ruff 0.16.10 (openjd-rs#429). expected = [ - "Syntax error: unexpected EOF while parsing\n", + "Syntax error: '(' was never closed\n", " (1 + 2\n", " ^~~~~~", ] @@ -320,7 +321,7 @@ def test_unclosed_bracket(self): with pytest.raises(ExpressionError) as exc_info: evaluate_expression("[1, 2, 3", values=SymbolTable()) expected = [ - "Syntax error: unexpected EOF while parsing\n", + "Syntax error: '[' was never closed\n", " [1, 2, 3\n", " ^~~~~~~~", ] @@ -331,7 +332,7 @@ def test_unclosed_string(self): with pytest.raises(ExpressionError) as exc_info: evaluate_expression("'unclosed", values=SymbolTable()) expected = [ - "Syntax error: missing closing quote in string literal\n", + "Syntax error: unterminated string literal (detected at line 1)\n", " 'unclosed\n", " ^~~~~~~~~", ] diff --git a/test/openjd/expr/test_unresolved_eval.py b/test/openjd/expr/test_unresolved_eval.py index 71bbd402..1242ee55 100644 --- a/test/openjd/expr/test_unresolved_eval.py +++ b/test/openjd/expr/test_unresolved_eval.py @@ -348,7 +348,7 @@ def test_incompatible_types_error(self) -> None: with pytest.raises(ExpressionError) as exc_info: evaluate_expression("[X, Y]", values=values) expected = [ - "List literal contains incompatible types: int, string\n", + "List literal contains incompatible types: int and string\n", " [X, Y]\n", " ^~~~~~", ] @@ -908,3 +908,38 @@ def test_a_value_error_in_a_branch_is_still_absorbed(self, expression: str) -> N def test_the_expression_fits_within_a_generous_budget(self, expression: str) -> None: result = evaluate_expression(expression, values=self._values()) assert result.type == ExprType("unresolved[string]") + + +_UNRESOLVED_INT = ExprValue.unresolved(ExprType("int")) +_UNRESOLVED_BOOL = ExprValue.unresolved(ExprType("bool")) + + +class TestBoolOpAfterAnUnresolvedOperand: + """openjd-expr 0.12.0 (openjd-rs#435): once an and/or operand is unresolved, the + result is the union of every operand it could return. Before, the first later + concrete operand decided it, so a value error there rejected a valid expression + and a static value appeared that run time never produces. + """ + + @pytest.mark.parametrize( + ("expression", "values", "expected"), + [ + # 0.11.0: "Division by zero", though X may decide the result at run time. + ("10 // (X or Z)", {"X": _UNRESOLVED_INT, "Z": ExprValue(0)}, "unresolved[int]"), + # 0.11.0: ExprValue(3). + ("X or N", {"X": _UNRESOLVED_INT, "N": ExprValue(3)}, "unresolved[int]"), + # 0.11.0: typed as bool, so "upper() is not available for bool". + ( + "(F and S).upper()", + {"F": _UNRESOLVED_BOOL, "S": ExprValue("abc")}, + "unresolved[string]", + ), + # 0.11.0: ExprValue(0). + ("F and 1 or 0", {"F": _UNRESOLVED_BOOL}, "unresolved[int]"), + ], + ) + def test_the_result_is_unresolved_of_every_reachable_operand( + self, expression: str, values: dict, expected: str + ) -> None: + result = evaluate_expression(expression, values=SymbolTable(values)) + assert result.type == ExprType(expected) diff --git a/test/openjd/expr/test_uri_paths.py b/test/openjd/expr/test_uri_paths.py index 43f8464a..805c9e1f 100644 --- a/test/openjd/expr/test_uri_paths.py +++ b/test/openjd/expr/test_uri_paths.py @@ -16,6 +16,8 @@ output, identical contract. """ +import pytest + from openjd.expr import ExprValue, PathFormat, SymbolTable, evaluate_expression @@ -211,3 +213,26 @@ def test_uri_with_suffix_in_symtab(self) -> None: "P.with_suffix('.png')", values=symtab, path_format=PathFormat.POSIX ) assert str(result) == "s3://bucket/scene.png" + + +class TestSingleLetterSchemeIsAPath: + """openjd-expr 0.11.0 (openjd-rs#424, openjd-specifications#192): a URI scheme has + at least two characters, so ``C://`` is a Windows drive with a doubled separator, + not a URI with scheme ``c``. Before, it kept its ``//`` like ``s3://``. The path + format is pinned because the default follows the host. + """ + + @pytest.mark.parametrize( + ("expression", "posix", "windows"), + [ + ('path("C://scenes/a.ma").parent', "C:/scenes", "C:\\scenes"), + ('path(["C://scenes", "a.ma"])', "C:/scenes/a.ma", "C:\\scenes\\a.ma"), + # Control: a two-letter scheme is still a URI under either format. + ('path("s3://bucket/a/b").parent', "s3://bucket/a", "s3://bucket/a"), + ], + ) + def test_a_drive_letter_is_a_path_and_a_scheme_is_a_uri( + self, expression: str, posix: str, windows: str + ) -> None: + assert str(evaluate_expression(expression, path_format=PathFormat.POSIX)) == posix + assert str(evaluate_expression(expression, path_format=PathFormat.WINDOWS)) == windows diff --git a/test/openjd/model_v1/test_create_job.py b/test/openjd/model_v1/test_create_job.py index b2d4aca7..dc3b32a2 100644 --- a/test/openjd/model_v1/test_create_job.py +++ b/test/openjd/model_v1/test_create_job.py @@ -8,7 +8,6 @@ from pathlib import Path from typing import Any, Optional -from openjd.expr import ExpressionError from openjd.model._v1 import ( CallerLimits, ModelProfile, @@ -2899,14 +2898,18 @@ def test_walk_up_across_mixed_separators_is_rejected(self) -> None: class TestCreateJobLetFailureMessages: - """openjd-model 0.10.1 (openjd-rs#410) evaluates a job environment's ``let`` under - the caller's profile with the same diagnostic as a step script's ``let``. On - 0.10.0 the environment form read ``Error evaluating let binding 'q': ...`` and - quoted the whole binding, ``q = 1 / int(Param.X)``. + """A job environment's ``let`` and a step script's ``let`` fail ``create_job`` with + the same diagnostic (openjd-rs#410). Since openjd-model 0.12.0 (openjd-rs#428) it is + a ``ModelValidationError`` at the binding's path, with the caret under the full + binding, instead of an ``ExpressionError`` reading ``script let binding 'q': ...``. """ _LET = ["q = 1 / int(Param.X)"] - _EXPECTED = "script let binding 'q': Division by zero\n 1 / int(Param.X)\n ~~^~~~~~~~~~~~~~" + _DETAIL = "Invalid expression in let binding 'q': Division by zero\n q = 1 / int(Param.X)\n ~~^~~~~~~~~~~~~~" + _PATH = { + "step": "steps[0] -> script -> let[0]", + "job environment": "jobEnvironments[0] -> script -> let[0]", + } @classmethod def _decoded(cls, where: str) -> Any: @@ -2931,9 +2934,11 @@ def _decoded(cls, where: str) -> Any: @pytest.mark.parametrize("where", ["step", "job environment"]) def test_the_diagnostic_is_the_same_for_both(self, where: str) -> None: - with pytest.raises(ExpressionError) as excinfo: + with pytest.raises(ModelValidationError) as excinfo: create_job(job_template=self._decoded(where), job_parameter_values={"X": "0", "N": "1"}) - assert str(excinfo.value) == self._EXPECTED + assert str(excinfo.value) == ( + f"1 validation error for JobTemplate\n{self._PATH[where]}:\n\t{self._DETAIL}" + ) @pytest.mark.parametrize("where", ["step", "job environment"]) def test_a_value_that_evaluates_creates_the_job(self, where: str) -> None: