From 43f8ddbb7eecae804b3d30acb47c1c2025a18cc0 Mon Sep 17 00:00:00 2001 From: Henry Schimke <henry@azule.info> Date: Tue, 2 Jan 2024 17:52:01 -0600 Subject: [PATCH 1/2] update library to use rxing v0.5.0 v0.5.0 brings support for MicroQR codes, Telepen codes, and new handling for several filetypes including enhanced QrCode support --- Cargo.lock | 264 ++++++++++++++++++++++---------- Cargo.toml | 2 +- src/barcode_format.rs | 164 ++++++++++---------- src/decode.rs | 341 ++++++++++++++++++++++++------------------ src/encode.rs | 277 ++++++++++++++++++++-------------- src/lib.rs | 4 +- 6 files changed, 631 insertions(+), 421 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 3dc47fa..7b456d8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -16,13 +16,19 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "aho-corasick" -version = "0.7.20" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" +checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" dependencies = [ "memchr", ] +[[package]] +name = "android-tzdata" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" + [[package]] name = "android_system_properties" version = "0.1.5" @@ -59,12 +65,6 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" -[[package]] -name = "base64" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" - [[package]] name = "base64" version = "0.21.0" @@ -92,6 +92,12 @@ version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dcb6dd1c2376d2e096796e234a70e17e94cc2d5d54ff8ce42b28cef1d0d359a4" +[[package]] +name = "bit_reverse" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "99528ca30abb9495c7e106bf7c3177b257c62040fc0f2909fe470b0f43097296" + [[package]] name = "bitflags" version = "1.3.2" @@ -106,7 +112,7 @@ checksum = "ba3569f383e8f1598449f1a423e72e99569137b47740b1da11ef19af3d5c3223" dependencies = [ "lazy_static", "memchr", - "regex-automata", + "regex-automata 0.1.10", "serde", ] @@ -142,17 +148,16 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.23" +version = "0.4.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16b0a3d9ed01224b22057780a37bb8c5dbfe1be8ba48678e7bf57ec4b385411f" +checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" dependencies = [ + "android-tzdata", "iana-time-zone", "js-sys", - "num-integer", "num-traits", - "time", "wasm-bindgen", - "winapi", + "windows-targets", ] [[package]] @@ -630,9 +635,9 @@ dependencies = [ [[package]] name = "imagesize" -version = "0.10.1" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df19da1e92fbfec043ca97d622955381b1f3ee72a180ec999912df31b1ccd951" +checksum = "029d73f573d8e8d63e6d5020011d3255b28c3ba85d6cf870a07184ed23de9284" [[package]] name = "itertools" @@ -669,9 +674,9 @@ dependencies = [ [[package]] name = "kurbo" -version = "0.8.3" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a53776d271cfb873b17c618af0298445c88afc52837f3e948fa3fafd131f449" +checksum = "bd85a5776cd9500c2e2059c8c76c3b01528566b7fcbaf8098b55a33fc298849b" dependencies = [ "arrayvec", ] @@ -743,9 +748,9 @@ dependencies = [ [[package]] name = "memchr" -version = "2.5.0" +version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" +checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" [[package]] name = "memoffset" @@ -765,6 +770,15 @@ dependencies = [ "adler", ] +[[package]] +name = "multimap" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1a5d38b9b352dbd913288736af36af41c48d61b1a8cd34bcecd727561b7d511" +dependencies = [ + "serde", +] + [[package]] name = "nalgebra" version = "0.30.1" @@ -932,9 +946,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.17.1" +version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "owned_ttf_parser" @@ -1044,18 +1058,18 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "proc-macro2" -version = "1.0.53" +version = "1.0.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba466839c78239c09faf015484e5cc04860f88242cff4d03eb038f04b4699b73" +checksum = "2de98502f212cfcea8d0bb305bd0f49d7ebdd75b64ba0a68f937d888f4e0d6db" dependencies = [ "unicode-ident", ] [[package]] name = "quote" -version = "1.0.26" +version = "1.0.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc" +checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" dependencies = [ "proc-macro2", ] @@ -1161,12 +1175,13 @@ checksum = "3b42e27ef78c35d3998403c1d26f3efd9e135d3e5121b0a4845cc5cc27547f4f" [[package]] name = "regex" -version = "1.7.1" +version = "1.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48aaa5748ba571fb95cd2c85c09f629215d3a6ece942baa100950af03a34f733" +checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" dependencies = [ "aho-corasick", "memchr", + "regex-automata 0.4.3", "regex-syntax", ] @@ -1176,17 +1191,28 @@ version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" +[[package]] +name = "regex-automata" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + [[package]] name = "regex-syntax" -version = "0.6.28" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848" +checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" [[package]] name = "resvg" -version = "0.28.0" +version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c115863f2d3621999cf187e318bc92b16402dfeff6a48c74df700d77381394c1" +checksum = "b6554f47c38eca56827eea7f285c2a3018b4e12e0e195cc105833c008be338f1" dependencies = [ "log", "pico-args", @@ -1207,9 +1233,9 @@ dependencies = [ [[package]] name = "roxmltree" -version = "0.15.1" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b9de9831a129b122e7e61f242db509fa9d0838008bf0b29bb0624669edfe48a" +checksum = "862340e351ce1b271a378ec53f304a5558f7db87f3769dc655a8f6ecbb68b302" dependencies = [ "xmlparser", ] @@ -1228,21 +1254,22 @@ dependencies = [ name = "rxing" version = "0.0.0" dependencies = [ - "base64 0.21.0", + "base64", "data-url", "image", "napi", "napi-build", "napi-derive", - "rxing 0.4.3", + "rxing 0.5.0", ] [[package]] name = "rxing" -version = "0.4.3" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b192fb85936c639f8df533be9e46e252ce14e4f2e6e520fa1c26b2da70fc3574" +checksum = "0ef6e7b7db6d0ba4549752e70b7e63900531e4529c0b785f367efdf7f6455c72" dependencies = [ + "bit_reverse", "chrono", "chrono-tz", "codepage-437", @@ -1250,6 +1277,7 @@ dependencies = [ "fancy-regex", "image", "imageproc", + "multimap", "num", "once_cell", "regex", @@ -1264,9 +1292,9 @@ dependencies = [ [[package]] name = "rxing-one-d-proc-derive" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a74783f67ce5aea2c4b51adb06b71b568ad5f6993870b5db202eece5e2802485" +checksum = "110aacbea4a739b897ea5eb9ee6b14309ebc62bf5059138f9fd80d52a29ed11f" dependencies = [ "quote", "syn 1.0.107", @@ -1362,25 +1390,26 @@ dependencies = [ [[package]] name = "strict-num" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9df65f20698aeed245efdde3628a6b559ea1239bbb871af1b6e3b58c413b2bd1" +checksum = "6637bab7722d379c8b41ba849228d680cc12d0a45ba1fa2b48f2a30577a06731" dependencies = [ "float-cmp", ] [[package]] name = "svg" -version = "0.13.0" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e715e0c3fc987f4c435dc7189641fd9caa6919a74675ace605c38e201d278001" +checksum = "0d703a3635418d4e4d0e410009ddbfb65047ef9468b1d29afd3b057a5bc4c217" [[package]] name = "svgtypes" -version = "0.8.2" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22975e8a2bac6a76bb54f898a6b18764633b00e780330f0b689f65afb3975564" +checksum = "ed4b0611e7f3277f68c0fa18e385d9e2d26923691379690039548f867cef02a7" dependencies = [ + "kurbo", "siphasher", ] @@ -1397,9 +1426,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.8" +version = "2.0.46" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcc02725fd69ab9f26eab07fad303e2497fad6fb9eba4f96c4d1687bdf704ad9" +checksum = "89456b690ff72fddcecf231caedbe615c59480c93358a93dfae7fc29e3ebbf0e" dependencies = [ "proc-macro2", "quote", @@ -1417,22 +1446,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.40" +version = "1.0.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac" +checksum = "d54378c645627613241d077a3a79db965db602882668f9136ac42af9ecb730ad" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.40" +version = "1.0.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" +checksum = "fa0faa943b50f3db30a20aa7e265dbc66076993efed8463e8de414e5d06d3471" dependencies = [ "proc-macro2", "quote", - "syn 2.0.8", + "syn 2.0.46", ] [[package]] @@ -1464,36 +1493,26 @@ dependencies = [ "weezl", ] -[[package]] -name = "time" -version = "0.1.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b797afad3f312d1c66a56d11d0316f916356d11bd158fbc6ca6389ff6bf805a" -dependencies = [ - "libc", - "wasi 0.10.0+wasi-snapshot-preview1", - "winapi", -] - [[package]] name = "tiny-skia" -version = "0.8.3" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfef3412c6975196fdfac41ef232f910be2bb37b9dd3313a49a1a6bc815a5bdb" +checksum = "7db11798945fa5c3e5490c794ccca7c6de86d3afdd54b4eb324109939c6f37bc" dependencies = [ "arrayref", "arrayvec", "bytemuck", "cfg-if", + "log", "png", "tiny-skia-path", ] [[package]] name = "tiny-skia-path" -version = "0.8.3" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4b5edac058fc98f51c935daea4d805b695b38e2f151241cad125ade2a2ac20d" +checksum = "2f60aa35c89ac2687ace1a2556eaaea68e8c0d47408a2e3e7f5c98a489e7281c" dependencies = [ "arrayref", "bytemuck", @@ -1542,41 +1561,59 @@ dependencies = [ [[package]] name = "urlencoding" -version = "2.1.2" +version = "2.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8db7427f936968176eaa7cdf81b7f98b980b18495ec28f1b5791ac3bfe3eea9" +checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da" [[package]] name = "usvg" -version = "0.28.0" +version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b5b7c2b30845b3348c067ca3d09e20cc6e327c288f0ca4c48698712abf432e9" +checksum = "14d09ddfb0d93bf84824c09336d32e42f80961a9d1680832eb24fdf249ce11e6" +dependencies = [ + "base64", + "log", + "pico-args", + "usvg-parser", + "usvg-tree", + "xmlwriter", +] + +[[package]] +name = "usvg-parser" +version = "0.35.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d19bf93d230813599927d88557014e0908ecc3531666d47c634c6838bc8db408" dependencies = [ - "base64 0.13.1", "data-url", "flate2", "imagesize", "kurbo", "log", - "rctree", "roxmltree", "simplecss", "siphasher", - "strict-num", "svgtypes", + "usvg-tree", ] [[package]] -name = "wasi" -version = "0.9.0+wasi-snapshot-preview1" +name = "usvg-tree" +version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" +checksum = "7939a7e4ed21cadb5d311d6339730681c3e24c3e81d60065be80e485d3fc8b92" +dependencies = [ + "rctree", + "strict-num", + "svgtypes", + "tiny-skia-path", +] [[package]] name = "wasi" -version = "0.10.0+wasi-snapshot-preview1" +version = "0.9.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" +checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" [[package]] name = "wasi" @@ -1685,11 +1722,74 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" +[[package]] +name = "windows-targets" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" +dependencies = [ + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" + +[[package]] +name = "windows_i686_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" + +[[package]] +name = "windows_i686_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" + [[package]] name = "xmlparser" -version = "0.13.5" +version = "0.13.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "66fee0b777b0f5ac1c69bb06d361268faafa61cd4682ae064a171c16c433e9e4" + +[[package]] +name = "xmlwriter" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d25c75bf9ea12c4040a97f829154768bbbce366287e2dc044af160cd79a13fd" +checksum = "ec7a2a501ed189703dba8b08142f057e887dfc4b2cc4db2d343ac6376ba3e0b9" [[package]] name = "zune-inflate" diff --git a/Cargo.toml b/Cargo.toml index 5e624bd..99332a0 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -11,7 +11,7 @@ crate-type = ["cdylib"] napi = { version = "2.10.14", default-features = false, features = ["napi4"] } napi-derive = "2.10.1" image = "0.24.5" -rxing = {version = "~0.4.0", features = ["image", "svg_read", "svg_write"] } +rxing = {version = "~0.5.0", features = ["image", "svg_read", "svg_write"] } data-url = "0.2.0" base64 = "0.21.0" diff --git a/src/barcode_format.rs b/src/barcode_format.rs index 99b410c..c406623 100644 --- a/src/barcode_format.rs +++ b/src/barcode_format.rs @@ -6,107 +6,115 @@ use rxing::BarcodeFormat; #[napi(js_name = "BarcodeFormat")] #[derive(Debug, PartialEq, Eq, Hash)] pub enum JsBarcodeFormat { - /** Aztec 2D barcode format. */ - AZTEC, + /** Aztec 2D barcode format. */ + AZTEC, - /** CODABAR 1D format. */ - CODABAR, + /** CODABAR 1D format. */ + CODABAR, - /** Code 39 1D format. */ - Code39, + /** Code 39 1D format. */ + Code39, - /** Code 93 1D format. */ - Code93, + /** Code 93 1D format. */ + Code93, - /** Code 128 1D format. */ - Code128, + /** Code 128 1D format. */ + Code128, - /** Data Matrix 2D barcode format. */ - DataMatrix, + /** Data Matrix 2D barcode format. */ + DataMatrix, - /** EAN-8 1D format. */ - Ean8, + /** EAN-8 1D format. */ + Ean8, - /** EAN-13 1D format. */ - Ean13, + /** EAN-13 1D format. */ + Ean13, - /** ITF (Interleaved Two of Five) 1D format. */ - ITF, + /** ITF (Interleaved Two of Five) 1D format. */ + ITF, - /** MaxiCode 2D barcode format. */ - MAXICODE, + /** MaxiCode 2D barcode format. */ + MAXICODE, - /** PDF417 format. */ - Pdf417, + /** PDF417 format. */ + Pdf417, - /** QR Code 2D barcode format. */ - QrCode, + /** QR Code 2D barcode format. */ + QrCode, - /** RSS 14 */ - Rss14, + /** RSS 14 */ + Rss14, - /** RSS EXPANDED */ - RssExpanded, + /** RSS EXPANDED */ + RssExpanded, - /** UPC-A 1D format. */ - UpcA, + /** UPC-A 1D format. */ + UpcA, - /** UPC-E 1D format. */ - UpcE, + /** UPC-E 1D format. */ + UpcE, - /** UPC/EAN extension format. Not a stand-alone format. */ - UpcEanExtension, + /** UPC/EAN extension format. Not a stand-alone format. */ + UpcEanExtension, - /// - UnsupportedFormat, + Telepen, + + MicroQR, + + /// + UnsupportedFormat, } impl From<JsBarcodeFormat> for BarcodeFormat { - fn from(value: JsBarcodeFormat) -> Self { - match value { - JsBarcodeFormat::AZTEC => BarcodeFormat::AZTEC, - JsBarcodeFormat::CODABAR => BarcodeFormat::CODABAR, - JsBarcodeFormat::Code39 => BarcodeFormat::CODE_39, - JsBarcodeFormat::Code93 => BarcodeFormat::CODE_93, - JsBarcodeFormat::Code128 => BarcodeFormat::CODE_128, - JsBarcodeFormat::DataMatrix => BarcodeFormat::DATA_MATRIX, - JsBarcodeFormat::Ean8 => BarcodeFormat::EAN_8, - JsBarcodeFormat::Ean13 => BarcodeFormat::EAN_13, - JsBarcodeFormat::ITF => BarcodeFormat::ITF, - JsBarcodeFormat::MAXICODE => BarcodeFormat::MAXICODE, - JsBarcodeFormat::Pdf417 => BarcodeFormat::PDF_417, - JsBarcodeFormat::QrCode => BarcodeFormat::QR_CODE, - JsBarcodeFormat::Rss14 => BarcodeFormat::RSS_14, - JsBarcodeFormat::RssExpanded => BarcodeFormat::RSS_EXPANDED, - JsBarcodeFormat::UpcA => BarcodeFormat::UPC_A, - JsBarcodeFormat::UpcE => BarcodeFormat::UPC_E, - JsBarcodeFormat::UpcEanExtension => BarcodeFormat::UPC_EAN_EXTENSION, - JsBarcodeFormat::UnsupportedFormat => BarcodeFormat::UNSUPORTED_FORMAT, - } + fn from(value: JsBarcodeFormat) -> Self { + match value { + JsBarcodeFormat::AZTEC => BarcodeFormat::AZTEC, + JsBarcodeFormat::CODABAR => BarcodeFormat::CODABAR, + JsBarcodeFormat::Code39 => BarcodeFormat::CODE_39, + JsBarcodeFormat::Code93 => BarcodeFormat::CODE_93, + JsBarcodeFormat::Code128 => BarcodeFormat::CODE_128, + JsBarcodeFormat::DataMatrix => BarcodeFormat::DATA_MATRIX, + JsBarcodeFormat::Ean8 => BarcodeFormat::EAN_8, + JsBarcodeFormat::Ean13 => BarcodeFormat::EAN_13, + JsBarcodeFormat::ITF => BarcodeFormat::ITF, + JsBarcodeFormat::MAXICODE => BarcodeFormat::MAXICODE, + JsBarcodeFormat::Pdf417 => BarcodeFormat::PDF_417, + JsBarcodeFormat::QrCode => BarcodeFormat::QR_CODE, + JsBarcodeFormat::Rss14 => BarcodeFormat::RSS_14, + JsBarcodeFormat::RssExpanded => BarcodeFormat::RSS_EXPANDED, + JsBarcodeFormat::UpcA => BarcodeFormat::UPC_A, + JsBarcodeFormat::UpcE => BarcodeFormat::UPC_E, + JsBarcodeFormat::UpcEanExtension => BarcodeFormat::UPC_EAN_EXTENSION, + JsBarcodeFormat::UnsupportedFormat => BarcodeFormat::UNSUPORTED_FORMAT, + JsBarcodeFormat::Telepen => BarcodeFormat::TELEPEN, + JsBarcodeFormat::MicroQR => BarcodeFormat::MICRO_QR_CODE, } + } } impl From<BarcodeFormat> for JsBarcodeFormat { - fn from(value: BarcodeFormat) -> Self { - match value { - BarcodeFormat::AZTEC => JsBarcodeFormat::AZTEC, - BarcodeFormat::CODABAR => JsBarcodeFormat::CODABAR, - BarcodeFormat::CODE_39 => JsBarcodeFormat::Code39, - BarcodeFormat::CODE_93 => JsBarcodeFormat::Code93, - BarcodeFormat::CODE_128 => JsBarcodeFormat::Code128, - BarcodeFormat::DATA_MATRIX => JsBarcodeFormat::DataMatrix, - BarcodeFormat::EAN_8 => JsBarcodeFormat::Ean8, - BarcodeFormat::EAN_13 => JsBarcodeFormat::Ean13, - BarcodeFormat::ITF => JsBarcodeFormat::ITF, - BarcodeFormat::MAXICODE => JsBarcodeFormat::MAXICODE, - BarcodeFormat::PDF_417 => JsBarcodeFormat::Pdf417, - BarcodeFormat::QR_CODE => JsBarcodeFormat::QrCode, - BarcodeFormat::RSS_14 => JsBarcodeFormat::Rss14, - BarcodeFormat::RSS_EXPANDED => JsBarcodeFormat::RssExpanded, - BarcodeFormat::UPC_A => JsBarcodeFormat::UpcA, - BarcodeFormat::UPC_E => JsBarcodeFormat::UpcE, - BarcodeFormat::UPC_EAN_EXTENSION => JsBarcodeFormat::UpcEanExtension, - BarcodeFormat::UNSUPORTED_FORMAT => JsBarcodeFormat::UnsupportedFormat, - } + fn from(value: BarcodeFormat) -> Self { + match value { + BarcodeFormat::AZTEC => JsBarcodeFormat::AZTEC, + BarcodeFormat::CODABAR => JsBarcodeFormat::CODABAR, + BarcodeFormat::CODE_39 => JsBarcodeFormat::Code39, + BarcodeFormat::CODE_93 => JsBarcodeFormat::Code93, + BarcodeFormat::CODE_128 => JsBarcodeFormat::Code128, + BarcodeFormat::DATA_MATRIX => JsBarcodeFormat::DataMatrix, + BarcodeFormat::EAN_8 => JsBarcodeFormat::Ean8, + BarcodeFormat::EAN_13 => JsBarcodeFormat::Ean13, + BarcodeFormat::ITF => JsBarcodeFormat::ITF, + BarcodeFormat::MAXICODE => JsBarcodeFormat::MAXICODE, + BarcodeFormat::PDF_417 => JsBarcodeFormat::Pdf417, + BarcodeFormat::QR_CODE => JsBarcodeFormat::QrCode, + BarcodeFormat::RSS_14 => JsBarcodeFormat::Rss14, + BarcodeFormat::RSS_EXPANDED => JsBarcodeFormat::RssExpanded, + BarcodeFormat::UPC_A => JsBarcodeFormat::UpcA, + BarcodeFormat::UPC_E => JsBarcodeFormat::UpcE, + BarcodeFormat::UPC_EAN_EXTENSION => JsBarcodeFormat::UpcEanExtension, + BarcodeFormat::UNSUPORTED_FORMAT => JsBarcodeFormat::UnsupportedFormat, + BarcodeFormat::TELEPEN => JsBarcodeFormat::Telepen, + BarcodeFormat::MICRO_QR_CODE => JsBarcodeFormat::MicroQR, } + } } diff --git a/src/decode.rs b/src/decode.rs index 7a435a1..211675d 100644 --- a/src/decode.rs +++ b/src/decode.rs @@ -4,8 +4,8 @@ use std::collections::{HashMap, HashSet}; use std::path::Path; use std::str; -use base64::Engine; use base64::engine::general_purpose; +use base64::Engine; use data_url::DataUrl; use napi::bindgen_prelude::Either; use rxing::{BarcodeFormat, DecodeHintType, DecodeHintValue, DecodingHintDictionary, RXingResult}; @@ -15,37 +15,37 @@ use crate::barcode_format::JsBarcodeFormat; #[napi(object)] #[derive(Default)] pub struct DecodeOptions { - pub try_harder: Option<bool>, - pub decode_multi: Option<bool>, - pub barcode_format: Option<Vec<JsBarcodeFormat>>, - pub pure_barcode: Option<bool>, - pub character_set: Option<String>, - pub allowed_lengths: Option<Vec<u32>>, - pub assume_code39_check_digit: Option<bool>, - pub assume_gs1: Option<bool>, - pub return_codabar_start_end: Option<bool>, - pub allowed_ean_extensions: Option<Vec<u32>>, - pub also_inverted: Option<bool>, - pub other: Option<String>, + pub try_harder: Option<bool>, + pub decode_multi: Option<bool>, + pub barcode_format: Option<Vec<JsBarcodeFormat>>, + pub pure_barcode: Option<bool>, + pub character_set: Option<String>, + pub allowed_lengths: Option<Vec<u32>>, + pub assume_code39_check_digit: Option<bool>, + pub assume_gs1: Option<bool>, + pub return_codabar_start_end: Option<bool>, + pub allowed_ean_extensions: Option<Vec<u32>>, + pub also_inverted: Option<bool>, + pub other: Option<String>, } #[napi(object)] pub struct DecodeResult { - pub text: String, - pub raw_bytes: Vec<u8>, - pub num_bits: u32, - pub format: JsBarcodeFormat, + pub text: String, + pub raw_bytes: Vec<u8>, + pub num_bits: u32, + pub format: JsBarcodeFormat, } impl From<RXingResult> for DecodeResult { - fn from(value: RXingResult) -> Self { - DecodeResult { - text: value.getText().to_string(), - raw_bytes: value.getRawBytes().to_vec(), - num_bits: value.getNumBits() as u32, - format: (*value.getBarcodeFormat()).into(), - } - } + fn from(value: RXingResult) -> Self { + DecodeResult { + text: value.getText().to_string(), + raw_bytes: value.getRawBytes().to_vec(), + num_bits: value.getNumBits() as u32, + format: (*value.getBarcodeFormat()).into(), + } + } } /** @@ -65,142 +65,191 @@ impl From<RXingResult> for DecodeResult { * console.log(result.text); */ #[napi] -pub fn decode(input: String, options: Option<DecodeOptions>) -> Option<Either<DecodeResult, Vec<DecodeResult>>> { - let options = options.unwrap_or_default(); - let mut hints: DecodingHintDictionary = HashMap::new(); - - if let Some(other) = options.other { - hints.insert(DecodeHintType::OTHER, DecodeHintValue::Other(other)); - } - - if let Some(pure_barcode) = options.pure_barcode { - hints.insert(DecodeHintType::PURE_BARCODE, DecodeHintValue::PureBarcode(pure_barcode)); - } - - if let Some(character_set) = options.character_set { - hints.insert(DecodeHintType::CHARACTER_SET, DecodeHintValue::CharacterSet(character_set)); - } - - if let Some(allowed_lengths) = options.allowed_lengths { - hints.insert(DecodeHintType::ALLOWED_LENGTHS, DecodeHintValue::AllowedLengths(allowed_lengths)); - } - - if let Some(assume_code39_check_digit) = options.assume_code39_check_digit { - hints.insert(DecodeHintType::ASSUME_CODE_39_CHECK_DIGIT, DecodeHintValue::AssumeCode39CheckDigit(assume_code39_check_digit)); - } - - if let Some(assume_gs1) = options.assume_gs1 { - hints.insert(DecodeHintType::ASSUME_GS1, DecodeHintValue::AssumeGs1(assume_gs1)); - } - - if let Some(return_codabar_start_end) = options.return_codabar_start_end { - hints.insert(DecodeHintType::RETURN_CODABAR_START_END, DecodeHintValue::ReturnCodabarStartEnd(return_codabar_start_end)); - } - - if let Some(allowed_ean_extensions) = options.allowed_ean_extensions { - hints.insert(DecodeHintType::ALLOWED_EAN_EXTENSIONS, DecodeHintValue::AllowedEanExtensions(allowed_ean_extensions)); - } - - if let Some(also_inverted) = options.also_inverted { - hints.insert(DecodeHintType::ALSO_INVERTED, DecodeHintValue::AlsoInverted(also_inverted)); - } - - // Default to true if not specified - let try_harder = options.try_harder.unwrap_or(true); - hints.insert(DecodeHintType::TRY_HARDER, DecodeHintValue::TryHarder(try_harder)); - - if let Some(barcode_format) = options.barcode_format { - let barcode_format: Vec<BarcodeFormat> = barcode_format.into_iter().map(|x| x.into()).collect(); - hints.insert(DecodeHintType::POSSIBLE_FORMATS, DecodeHintValue::PossibleFormats(HashSet::from_iter( - barcode_format.iter().copied(), - ))); - } - - let decode_multi = options.decode_multi.unwrap_or(false); - match get_input(&input) { - Either::A(input_file) => { - detect_in_file(input_file, decode_multi, &mut hints) - } - Either::B(luma_tuple) => { - detect_in_luma(luma_tuple, decode_multi, &mut hints) - } - } +pub fn decode( + input: String, + options: Option<DecodeOptions>, +) -> Option<Either<DecodeResult, Vec<DecodeResult>>> { + let options = options.unwrap_or_default(); + let mut hints: DecodingHintDictionary = HashMap::new(); + + if let Some(other) = options.other { + hints.insert(DecodeHintType::OTHER, DecodeHintValue::Other(other)); + } + + if let Some(pure_barcode) = options.pure_barcode { + hints.insert( + DecodeHintType::PURE_BARCODE, + DecodeHintValue::PureBarcode(pure_barcode), + ); + } + + if let Some(character_set) = options.character_set { + hints.insert( + DecodeHintType::CHARACTER_SET, + DecodeHintValue::CharacterSet(character_set), + ); + } + + if let Some(allowed_lengths) = options.allowed_lengths { + hints.insert( + DecodeHintType::ALLOWED_LENGTHS, + DecodeHintValue::AllowedLengths(allowed_lengths), + ); + } + + if let Some(assume_code39_check_digit) = options.assume_code39_check_digit { + hints.insert( + DecodeHintType::ASSUME_CODE_39_CHECK_DIGIT, + DecodeHintValue::AssumeCode39CheckDigit(assume_code39_check_digit), + ); + } + + if let Some(assume_gs1) = options.assume_gs1 { + hints.insert( + DecodeHintType::ASSUME_GS1, + DecodeHintValue::AssumeGs1(assume_gs1), + ); + } + + if let Some(return_codabar_start_end) = options.return_codabar_start_end { + hints.insert( + DecodeHintType::RETURN_CODABAR_START_END, + DecodeHintValue::ReturnCodabarStartEnd(return_codabar_start_end), + ); + } + + if let Some(allowed_ean_extensions) = options.allowed_ean_extensions { + hints.insert( + DecodeHintType::ALLOWED_EAN_EXTENSIONS, + DecodeHintValue::AllowedEanExtensions(allowed_ean_extensions), + ); + } + + if let Some(also_inverted) = options.also_inverted { + hints.insert( + DecodeHintType::ALSO_INVERTED, + DecodeHintValue::AlsoInverted(also_inverted), + ); + } + + // Default to true if not specified + let try_harder = options.try_harder.unwrap_or(true); + hints.insert( + DecodeHintType::TRY_HARDER, + DecodeHintValue::TryHarder(try_harder), + ); + + if let Some(barcode_format) = options.barcode_format { + let barcode_format: Vec<BarcodeFormat> = barcode_format.into_iter().map(|x| x.into()).collect(); + hints.insert( + DecodeHintType::POSSIBLE_FORMATS, + DecodeHintValue::PossibleFormats(HashSet::from_iter(barcode_format.iter().copied())), + ); + } + + let decode_multi = options.decode_multi.unwrap_or(false); + match get_input(&input) { + Either::A(input_file) => detect_in_file(input_file, decode_multi, &mut hints), + Either::B(luma_tuple) => detect_in_luma(luma_tuple, decode_multi, &mut hints), + } } fn get_input(input: &str) -> Either<&str, (Vec<u8>, u32, u32)> { - match DataUrl::process(input) { - Ok(data_url) => { - if let Ok((body, _)) = data_url.decode_to_vec() { - Either::B(create_luma_image(&body)) - } else { - Either::A(input) - } - } - Err(_) => { // invalid data url - if let Ok(bytes) = general_purpose::STANDARD.decode(input.as_bytes()) { - Either::B(create_luma_image(&bytes)) - } else { - Either::A(input) - } - } - } + match DataUrl::process(input) { + Ok(data_url) => { + if let Ok((body, _)) = data_url.decode_to_vec() { + Either::B(create_luma_image(&body)) + } else { + Either::A(input) + } + } + Err(_) => { + // invalid data url + if let Ok(bytes) = general_purpose::STANDARD.decode(input.as_bytes()) { + Either::B(create_luma_image(&bytes)) + } else { + Either::A(input) + } + } + } } fn create_luma_image(bytes: &[u8]) -> (Vec<u8>, u32, u32) { - let image = image::load_from_memory(bytes).unwrap(); - let image = image.to_luma8(); - let (width, height) = image.dimensions(); - let image = image.into_raw(); + let image = image::load_from_memory(bytes).unwrap(); + let image = image.to_luma8(); + let (width, height) = image.dimensions(); + let image = image.into_raw(); - (image, width, height) + (image, width, height) } -fn detect_in_file(input_file: &str, decode_multi: bool, hints: &mut DecodingHintDictionary) -> Option<Either<DecodeResult, Vec<DecodeResult>>> { - let path = Path::new(&input_file); - let extension = path.extension().unwrap_or_default(); - - if decode_multi { - let result = if extension == "svg" { - rxing::helpers::detect_multiple_in_svg_with_hints(input_file, hints) - } else { - rxing::helpers::detect_multiple_in_file_with_hints(input_file, hints) - }; - process_multi_result(result) +fn detect_in_file( + input_file: &str, + decode_multi: bool, + hints: &mut DecodingHintDictionary, +) -> Option<Either<DecodeResult, Vec<DecodeResult>>> { + let path = Path::new(&input_file); + let extension = path.extension().unwrap_or_default(); + + if decode_multi { + let result = if extension == "svg" { + rxing::helpers::detect_multiple_in_svg_with_hints(input_file, hints) } else { - let result = if extension == "svg" { - rxing::helpers::detect_in_svg_with_hints(input_file, None, hints) - } else { - rxing::helpers::detect_in_file_with_hints(input_file, None, hints) - }; - - if let Ok(result) = result { - Some(Either::A(result.into())) - } else { - None - } - } -} - -fn detect_in_luma(luma_tuple: (Vec<u8>, u32, u32), decode_multi: bool, hints: &mut DecodingHintDictionary) -> Option<Either<DecodeResult, Vec<DecodeResult>>> { - if decode_multi { - let result = rxing::helpers::detect_multiple_in_luma_with_hints(luma_tuple.0, luma_tuple.1, luma_tuple.2, hints); - process_multi_result(result) + rxing::helpers::detect_multiple_in_file_with_hints(input_file, hints) + }; + process_multi_result(result) + } else { + let result = if extension == "svg" { + rxing::helpers::detect_in_svg_with_hints(input_file, None, hints) } else { - let result = rxing::helpers::detect_in_luma_with_hints(luma_tuple.0, luma_tuple.1, luma_tuple.2, None, hints); + rxing::helpers::detect_in_file_with_hints(input_file, None, hints) + }; - if let Ok(result) = result { - Some(Either::A(result.into())) - } else { - None - } + if let Ok(result) = result { + Some(Either::A(result.into())) + } else { + None } + } } -fn process_multi_result<E>(results: Result<Vec<RXingResult>, E>) -> Option<Either<DecodeResult, Vec<DecodeResult>>> { - if let Ok(results) = results { - let results: Vec<DecodeResult> = results.into_iter().map(|x| x.into()).collect(); - Some(Either::B(results)) +fn detect_in_luma( + luma_tuple: (Vec<u8>, u32, u32), + decode_multi: bool, + hints: &mut DecodingHintDictionary, +) -> Option<Either<DecodeResult, Vec<DecodeResult>>> { + if decode_multi { + let result = rxing::helpers::detect_multiple_in_luma_with_hints( + luma_tuple.0, + luma_tuple.1, + luma_tuple.2, + hints, + ); + process_multi_result(result) + } else { + let result = rxing::helpers::detect_in_luma_with_hints( + luma_tuple.0, + luma_tuple.1, + luma_tuple.2, + None, + hints, + ); + + if let Ok(result) = result { + Some(Either::A(result.into())) } else { - None + None } + } +} + +fn process_multi_result<E>( + results: Result<Vec<RXingResult>, E>, +) -> Option<Either<DecodeResult, Vec<DecodeResult>>> { + if let Ok(results) = results { + let results: Vec<DecodeResult> = results.into_iter().map(|x| x.into()).collect(); + Some(Either::B(results)) + } else { + None + } } diff --git a/src/encode.rs b/src/encode.rs index 7345486..140cf7f 100644 --- a/src/encode.rs +++ b/src/encode.rs @@ -11,25 +11,25 @@ use crate::JsBarcodeFormat; #[napi(object)] #[derive(Default)] pub struct EncodeOptions { - pub barcode_format: Option<JsBarcodeFormat>, - pub width: Option<u32>, - pub height: Option<u32>, - pub margin: Option<u32>, - pub error_correction: Option<String>, - pub character_set: Option<String>, - pub data_matrix_compact: Option<bool>, - pub pdf417_compact: Option<bool>, - pub pdf417_compaction: Option<String>, - pub pdf417_auto_eci: Option<bool>, - pub aztec_layers: Option<i32>, - pub qr_version: Option<String>, - pub qr_mask_pattern: Option<String>, - pub qr_compact: Option<bool>, - pub gs1_format: Option<bool>, - pub force_code_set: Option<String>, - pub force_c40: Option<bool>, - pub code128_compact: Option<bool>, - pub output_file: Option<String>, + pub barcode_format: Option<JsBarcodeFormat>, + pub width: Option<u32>, + pub height: Option<u32>, + pub margin: Option<u32>, + pub error_correction: Option<String>, + pub character_set: Option<String>, + pub data_matrix_compact: Option<bool>, + pub pdf417_compact: Option<bool>, + pub pdf417_compaction: Option<String>, + pub pdf417_auto_eci: Option<bool>, + pub aztec_layers: Option<i32>, + pub qr_version: Option<String>, + pub qr_mask_pattern: Option<String>, + pub qr_compact: Option<bool>, + pub gs1_format: Option<bool>, + pub force_code_set: Option<String>, + pub force_c40: Option<bool>, + pub code128_compact: Option<bool>, + pub output_file: Option<String>, } /** @@ -50,106 +50,159 @@ pub struct EncodeOptions { */ #[napi] pub fn encode(data: String, options: Option<EncodeOptions>) -> Option<Buffer> { - let options = options.unwrap_or_default(); - let mut hints: EncodingHintDictionary = HashMap::new(); - - let barcode_format = options.barcode_format.unwrap_or(JsBarcodeFormat::QrCode); - let width = options.width.unwrap_or(200); - let height = options.height.unwrap_or_else(|| if barcode_format == JsBarcodeFormat::QrCode{ - width + let options = options.unwrap_or_default(); + let mut hints: EncodingHintDictionary = HashMap::new(); + + let barcode_format = options.barcode_format.unwrap_or(JsBarcodeFormat::QrCode); + let width = options.width.unwrap_or(200); + let height = options.height.unwrap_or_else(|| { + if barcode_format == JsBarcodeFormat::QrCode { + width } else { - 200 - }); - let margin = options.margin.unwrap_or(0); - - hints.insert(EncodeHintType::MARGIN, EncodeHintValue::Margin(margin.to_string())); - - if let Some(error_correction) = options.error_correction { - hints.insert(EncodeHintType::ERROR_CORRECTION, EncodeHintValue::ErrorCorrection(error_correction)); - } - - if let Some(character_set) = options.character_set { - hints.insert(EncodeHintType::CHARACTER_SET, EncodeHintValue::CharacterSet(character_set)); - } - - if let Some(data_matrix_compact) = options.data_matrix_compact { - hints.insert(EncodeHintType::DATA_MATRIX_COMPACT, EncodeHintValue::DataMatrixCompact(data_matrix_compact)); - } - - if let Some(pdf417_compact) = options.pdf417_compact { - hints.insert(EncodeHintType::PDF417_COMPACT, EncodeHintValue::Pdf417Compact(pdf417_compact.to_string())); - } - - if let Some(pdf417_compaction) = options.pdf417_compaction { - hints.insert(EncodeHintType::PDF417_COMPACTION, EncodeHintValue::Pdf417Compaction(pdf417_compaction)); - } - - if let Some(pdf417_auto_eci) = options.pdf417_auto_eci { - hints.insert(EncodeHintType::PDF417_AUTO_ECI, EncodeHintValue::Pdf417AutoEci(pdf417_auto_eci.to_string())); - } - - if let Some(aztec_layers) = options.aztec_layers { - hints.insert(EncodeHintType::AZTEC_LAYERS, EncodeHintValue::AztecLayers(aztec_layers)); + 200 } - - if let Some(qr_version) = options.qr_version { - hints.insert(EncodeHintType::QR_VERSION, EncodeHintValue::QrVersion(qr_version)); - } - - if let Some(qr_mask_pattern) = options.qr_mask_pattern { - hints.insert(EncodeHintType::QR_MASK_PATTERN, EncodeHintValue::QrMaskPattern(qr_mask_pattern)); - } - - if let Some(qr_compact) = options.qr_compact { - hints.insert(EncodeHintType::QR_COMPACT, EncodeHintValue::QrCompact(qr_compact.to_string())); - } - - if let Some(gs1_format) = options.gs1_format { - hints.insert(EncodeHintType::GS1_FORMAT, EncodeHintValue::Gs1Format(gs1_format)); - } - - if let Some(force_code_set) = options.force_code_set { - hints.insert(EncodeHintType::FORCE_CODE_SET, EncodeHintValue::ForceCodeSet(force_code_set)); - } - - if let Some(force_c40) = options.force_c40 { - hints.insert(EncodeHintType::FORCE_C40, EncodeHintValue::ForceC40(force_c40)); - } - - if let Some(code128_compact) = options.code128_compact { - hints.insert(EncodeHintType::CODE128_COMPACT, EncodeHintValue::Code128Compact(code128_compact)); - } - - let writer = MultiFormatWriter::default(); - if let Ok(bit_matrix) = writer.encode_with_hints( - &data, - &barcode_format.into(), - width as i32, - height as i32, - &hints, - ) { - let image: DynamicImage = bit_matrix.into(); - let mut bytes: Vec<u8> = Vec::new(); - - if image.write_to(&mut Cursor::new(&mut bytes), image::ImageOutputFormat::Jpeg(100)).is_ok() { - if let Some(file_path) = options.output_file { - if write_to_file(&file_path, &bytes).is_ok() { - Some(Buffer::from(bytes)) - } else { - None - } - } else { - Some(Buffer::from(bytes)) - } + }); + let margin = options.margin.unwrap_or(0); + + hints.insert( + EncodeHintType::MARGIN, + EncodeHintValue::Margin(margin.to_string()), + ); + + if let Some(error_correction) = options.error_correction { + hints.insert( + EncodeHintType::ERROR_CORRECTION, + EncodeHintValue::ErrorCorrection(error_correction), + ); + } + + if let Some(character_set) = options.character_set { + hints.insert( + EncodeHintType::CHARACTER_SET, + EncodeHintValue::CharacterSet(character_set), + ); + } + + if let Some(data_matrix_compact) = options.data_matrix_compact { + hints.insert( + EncodeHintType::DATA_MATRIX_COMPACT, + EncodeHintValue::DataMatrixCompact(data_matrix_compact), + ); + } + + if let Some(pdf417_compact) = options.pdf417_compact { + hints.insert( + EncodeHintType::PDF417_COMPACT, + EncodeHintValue::Pdf417Compact(pdf417_compact.to_string()), + ); + } + + if let Some(pdf417_compaction) = options.pdf417_compaction { + hints.insert( + EncodeHintType::PDF417_COMPACTION, + EncodeHintValue::Pdf417Compaction(pdf417_compaction), + ); + } + + if let Some(pdf417_auto_eci) = options.pdf417_auto_eci { + hints.insert( + EncodeHintType::PDF417_AUTO_ECI, + EncodeHintValue::Pdf417AutoEci(pdf417_auto_eci.to_string()), + ); + } + + if let Some(aztec_layers) = options.aztec_layers { + hints.insert( + EncodeHintType::AZTEC_LAYERS, + EncodeHintValue::AztecLayers(aztec_layers), + ); + } + + if let Some(qr_version) = options.qr_version { + hints.insert( + EncodeHintType::QR_VERSION, + EncodeHintValue::QrVersion(qr_version), + ); + } + + if let Some(qr_mask_pattern) = options.qr_mask_pattern { + hints.insert( + EncodeHintType::QR_MASK_PATTERN, + EncodeHintValue::QrMaskPattern(qr_mask_pattern), + ); + } + + if let Some(qr_compact) = options.qr_compact { + hints.insert( + EncodeHintType::QR_COMPACT, + EncodeHintValue::QrCompact(qr_compact.to_string()), + ); + } + + if let Some(gs1_format) = options.gs1_format { + hints.insert( + EncodeHintType::GS1_FORMAT, + EncodeHintValue::Gs1Format(gs1_format), + ); + } + + if let Some(force_code_set) = options.force_code_set { + hints.insert( + EncodeHintType::FORCE_CODE_SET, + EncodeHintValue::ForceCodeSet(force_code_set), + ); + } + + if let Some(force_c40) = options.force_c40 { + hints.insert( + EncodeHintType::FORCE_C40, + EncodeHintValue::ForceC40(force_c40), + ); + } + + if let Some(code128_compact) = options.code128_compact { + hints.insert( + EncodeHintType::CODE128_COMPACT, + EncodeHintValue::Code128Compact(code128_compact), + ); + } + + let writer = MultiFormatWriter::default(); + if let Ok(bit_matrix) = writer.encode_with_hints( + &data, + &barcode_format.into(), + width as i32, + height as i32, + &hints, + ) { + let image: DynamicImage = bit_matrix.into(); + let mut bytes: Vec<u8> = Vec::new(); + + if image + .write_to( + &mut Cursor::new(&mut bytes), + image::ImageOutputFormat::Jpeg(100), + ) + .is_ok() + { + if let Some(file_path) = options.output_file { + if write_to_file(&file_path, &bytes).is_ok() { + Some(Buffer::from(bytes)) } else { - None + None } + } else { + Some(Buffer::from(bytes)) + } } else { - None + None } + } else { + None + } } fn write_to_file(file_path: &str, bytes: &[u8]) -> Result<(), std::io::Error> { - let mut file = File::create(file_path)?; - file.write_all(bytes) + let mut file = File::create(file_path)?; + file.write_all(bytes) } diff --git a/src/lib.rs b/src/lib.rs index 56ee8c6..ba0b153 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -4,9 +4,9 @@ extern crate napi_derive; mod barcode_format; -mod encode; mod decode; +mod encode; pub use barcode_format::*; -pub use encode::*; pub use decode::*; +pub use encode::*; From 0c5aa9202a0fafc21a62b7757c92f32fe114b7f2 Mon Sep 17 00:00:00 2001 From: Henry Schimke <henry@azule.info> Date: Tue, 2 Jan 2024 17:53:54 -0600 Subject: [PATCH 2/2] update some deps --- Cargo.lock | 691 +++++++++++++++++++++-------------------------------- 1 file changed, 275 insertions(+), 416 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 7b456d8..fe51d75 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -49,15 +49,15 @@ dependencies = [ [[package]] name = "arrayref" -version = "0.3.6" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544" +checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" [[package]] name = "arrayvec" -version = "0.7.2" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6" +checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" [[package]] name = "autocfg" @@ -67,9 +67,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "base64" -version = "0.21.0" +version = "0.21.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a4ddaa51a5bc52a6948f74c06d20aaaddb71924eab79b8c97a8c556e942d6a" +checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9" [[package]] name = "bit-set" @@ -88,9 +88,9 @@ checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" [[package]] name = "bit_field" -version = "0.10.1" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcb6dd1c2376d2e096796e234a70e17e94cc2d5d54ff8ce42b28cef1d0d359a4" +checksum = "dc827186963e592360843fb5ba4b973e145841266c1357f7180c43526f2e5b61" [[package]] name = "bit_reverse" @@ -105,40 +105,37 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] -name = "bstr" -version = "0.2.17" +name = "bitflags" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba3569f383e8f1598449f1a423e72e99569137b47740b1da11ef19af3d5c3223" -dependencies = [ - "lazy_static", - "memchr", - "regex-automata 0.1.10", - "serde", -] +checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" [[package]] name = "bumpalo" -version = "3.12.0" +version = "3.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535" +checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" [[package]] name = "bytemuck" -version = "1.13.0" +version = "1.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c041d3eab048880cb0b86b256447da3f18859a163c3b8d8893f4e6368abe6393" +checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6" [[package]] name = "byteorder" -version = "1.4.3" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "cc" -version = "1.0.79" +version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" +checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" +dependencies = [ + "libc", +] [[package]] name = "cfg-if" @@ -157,14 +154,14 @@ dependencies = [ "js-sys", "num-traits", "wasm-bindgen", - "windows-targets", + "windows-targets 0.48.5", ] [[package]] name = "chrono-tz" -version = "0.8.1" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa48fa079165080f11d7753fd0bc175b7d391f276b965fe4b55bfad67856e463" +checksum = "91d7b79e99bfaa0d47da0687c43aa3b7381938a62ad3a6498599039321f660b7" dependencies = [ "chrono", "chrono-tz-build", @@ -173,9 +170,9 @@ dependencies = [ [[package]] name = "chrono-tz-build" -version = "0.1.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9998fb9f7e9b2111641485bf8beb32f92945f97f92a3d061f744cfef335f751" +checksum = "433e39f13c9a060046954e0592a8d0a4bcb1040125cbf91cb8ee58964cfb350f" dependencies = [ "parse-zoneinfo", "phf", @@ -191,16 +188,6 @@ dependencies = [ "csv", ] -[[package]] -name = "codespan-reporting" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e" -dependencies = [ - "termcolor", - "unicode-width", -] - [[package]] name = "color_quant" version = "1.1.0" @@ -227,9 +214,9 @@ dependencies = [ [[package]] name = "core-foundation-sys" -version = "0.8.3" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" +checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" [[package]] name = "crc32fast" @@ -240,21 +227,11 @@ dependencies = [ "cfg-if", ] -[[package]] -name = "crossbeam-channel" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2dd04ddaf88237dc3b8d8f9a3c1004b506b54b3313403944054d23c0870c521" -dependencies = [ - "cfg-if", - "crossbeam-utils", -] - [[package]] name = "crossbeam-deque" -version = "0.8.2" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "715e8152b692bba2d374b53d4875445368fdf21a94751410af607a5ac677d1fc" +checksum = "fca89a0e215bab21874660c67903c5f143333cab1da83d041c7ded6053774751" dependencies = [ "cfg-if", "crossbeam-epoch", @@ -263,22 +240,20 @@ dependencies = [ [[package]] name = "crossbeam-epoch" -version = "0.9.13" +version = "0.9.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01a9af1f4c2ef74bb8aa1f7e19706bc72d03598c8a570bb5de72243c7a9d9d5a" +checksum = "0e3681d554572a651dda4186cd47240627c3d0114d45a95f6ad27f2f22e7548d" dependencies = [ "autocfg", "cfg-if", "crossbeam-utils", - "memoffset", - "scopeguard", ] [[package]] name = "crossbeam-utils" -version = "0.8.14" +version = "0.8.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fb766fa798726286dbbb842f174001dab8abc7b627a1dd86e0b7222a95d929f" +checksum = "c3a430a770ebd84726f584a90ee7f020d28db52c6d02138900f22341f866d39c" dependencies = [ "cfg-if", ] @@ -291,11 +266,10 @@ checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" [[package]] name = "csv" -version = "1.1.6" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22813a6dc45b335f9bade10bf7271dc477e81113e89eb251a0bc2a8a81c536e1" +checksum = "ac574ff4d437a7b5ad237ef331c17ccca63c46479e5b5453eb8e10bb99a759fe" dependencies = [ - "bstr", "csv-core", "itoa", "ryu", @@ -304,21 +278,21 @@ dependencies = [ [[package]] name = "csv-core" -version = "0.1.10" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b2466559f260f48ad25fe6317b3c8dac77b5bdb5763ac7d9d6103530663bc90" +checksum = "5efa2b3d7902f4b634a20cae3c9c4e6209dc4779feb6863329607560143efa70" dependencies = [ "memchr", ] [[package]] name = "ctor" -version = "0.1.26" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d2301688392eb071b0bf1a37be05c469d3cc4dbbd95df672fe28ab021e6a096" +checksum = "30d2b3721e861707777e3195b0158f950ae6dc4a27e4d02ff9f67e3eb3de199e" dependencies = [ "quote", - "syn 1.0.107", + "syn 2.0.46", ] [[package]] @@ -327,50 +301,6 @@ version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ef8ae57c4978a2acd8b869ce6b9ca1dfe817bff704c220209fdef2c0b75a01b9" -[[package]] -name = "cxx" -version = "1.0.89" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc831ee6a32dd495436e317595e639a587aa9907bef96fe6e6abc290ab6204e9" -dependencies = [ - "cc", - "cxxbridge-flags", - "cxxbridge-macro", - "link-cplusplus", -] - -[[package]] -name = "cxx-build" -version = "1.0.89" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94331d54f1b1a8895cd81049f7eaaaef9d05a7dcb4d1fd08bf3ff0806246789d" -dependencies = [ - "cc", - "codespan-reporting", - "once_cell", - "proc-macro2", - "quote", - "scratch", - "syn 1.0.107", -] - -[[package]] -name = "cxxbridge-flags" -version = "1.0.89" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48dcd35ba14ca9b40d6e4b4b39961f23d835dbb8eed74565ded361d93e1feb8a" - -[[package]] -name = "cxxbridge-macro" -version = "1.0.89" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81bbeb29798b407ccd82a3324ade1a7286e0d29851475990b612670f6f5124d2" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.107", -] - [[package]] name = "data-url" version = "0.2.0" @@ -379,9 +309,9 @@ checksum = "8d7439c3735f405729d52c3fbbe4de140eaf938a1fe47d227c27f8254d4302a5" [[package]] name = "either" -version = "1.8.1" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" +checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" [[package]] name = "encoding" @@ -449,17 +379,17 @@ checksum = "a246d82be1c9d791c5dfde9a2bd045fc3cbba3fa2b11ad558f27d01712f00569" [[package]] name = "exr" -version = "1.5.3" +version = "1.71.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8af5ef47e2ed89d23d0ecbc1b681b30390069de70260937877514377fc24feb" +checksum = "832a761f35ab3e6664babfbdc6cef35a4860e816ec3916dcfd0882954e98a8a8" dependencies = [ "bit_field", "flume", "half", "lebe", "miniz_oxide", + "rayon-core", "smallvec", - "threadpool", "zune-inflate", ] @@ -473,11 +403,20 @@ dependencies = [ "regex", ] +[[package]] +name = "fdeflate" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "209098dd6dfc4445aa6111f0e98653ac323eaa4dfd212c9ca3931bf9955c31bd" +dependencies = [ + "simd-adler32", +] + [[package]] name = "flate2" -version = "1.0.25" +version = "1.0.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8a2db397cb1c8772f31494cb8917e48cd1e64f0fa7efac59fbd741a0a8ce841" +checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" dependencies = [ "crc32fast", "miniz_oxide", @@ -491,14 +430,10 @@ checksum = "98de4bbd547a563b716d8dfa9aad1cb19bfab00f4fa09a6a4ed21dbcf44ce9c4" [[package]] name = "flume" -version = "0.10.14" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1657b4441c3403d9f7b3409e47575237dac27b1b5726df654a6ecbf92f0f7577" +checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181" dependencies = [ - "futures-core", - "futures-sink", - "nanorand", - "pin-project", "spin", ] @@ -508,18 +443,6 @@ version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" -[[package]] -name = "futures-core" -version = "0.3.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec90ff4d0fe1f57d600049061dc6bb68ed03c7d2fbd697274c41805dcb3f8608" - -[[package]] -name = "futures-sink" -version = "0.3.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f310820bb3e8cfd46c80db4d7fb8353e15dfff853a127158425f31e0be6c8364" - [[package]] name = "getrandom" version = "0.1.16" @@ -528,27 +451,14 @@ checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" dependencies = [ "cfg-if", "libc", - "wasi 0.9.0+wasi-snapshot-preview1", -] - -[[package]] -name = "getrandom" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31" -dependencies = [ - "cfg-if", - "js-sys", - "libc", - "wasi 0.11.0+wasi-snapshot-preview1", - "wasm-bindgen", + "wasi", ] [[package]] name = "gif" -version = "0.11.4" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3edd93c6756b4dfaf2709eafcc345ba2636565295c198a9cfbf75fa5e3e00b06" +checksum = "80792593675e051cf94a4b111980da2ba60d4a83e43e0048c5693baab3977045" dependencies = [ "color_quant", "weezl", @@ -563,44 +473,34 @@ dependencies = [ "crunchy", ] -[[package]] -name = "hermit-abi" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" -dependencies = [ - "libc", -] - [[package]] name = "iana-time-zone" -version = "0.1.53" +version = "0.1.59" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64c122667b287044802d6ce17ee2ddf13207ed924c712de9a66a5814d5b64765" +checksum = "b6a67363e2aa4443928ce15e57ebae94fd8949958fd1223c4cfc0cd473ad7539" dependencies = [ "android_system_properties", "core-foundation-sys", "iana-time-zone-haiku", "js-sys", "wasm-bindgen", - "winapi", + "windows-core", ] [[package]] name = "iana-time-zone-haiku" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0703ae284fc167426161c2e3f1da3ea71d94b21bedbcc9494e92b28e334e3dca" +checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" dependencies = [ - "cxx", - "cxx-build", + "cc", ] [[package]] name = "image" -version = "0.24.5" +version = "0.24.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69b7ea949b537b0fd0af141fff8c77690f2ce96f4f41f042ccb6c69c6c965945" +checksum = "6f3dfdbdd72063086ff443e297b61695500514b1e41095b6fb9a5ab48a70a711" dependencies = [ "bytemuck", "byteorder", @@ -611,7 +511,7 @@ dependencies = [ "num-rational", "num-traits", "png", - "scoped_threadpool", + "qoi", "tiff", ] @@ -650,9 +550,9 @@ dependencies = [ [[package]] name = "itoa" -version = "0.4.8" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4" +checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" [[package]] name = "jpeg-decoder" @@ -665,9 +565,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.61" +version = "0.3.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "445dde2150c55e483f3d8416706b97ec8e8237c307e5b7b4b8dd15e6af2a0730" +checksum = "cee9c64da59eae3b50095c18d3e74f8b73c0b86d2792824ff01bbce68ba229ca" dependencies = [ "wasm-bindgen", ] @@ -695,34 +595,25 @@ checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8" [[package]] name = "libc" -version = "0.2.139" +version = "0.2.151" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79" +checksum = "302d7ab3130588088d277783b1e2d2e10c9e9e4a16dd9050e6ec93fb3e7048f4" [[package]] name = "libloading" -version = "0.7.4" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" +checksum = "c571b676ddfc9a8c12f1f3d3085a7b163966a8fd8098a90640953ce5f6170161" dependencies = [ "cfg-if", - "winapi", -] - -[[package]] -name = "link-cplusplus" -version = "1.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecd207c9c713c34f95a097a5b029ac2ce6010530c7b49d7fea24d977dede04f5" -dependencies = [ - "cc", + "windows-sys", ] [[package]] name = "lock_api" -version = "0.4.9" +version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df" +checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" dependencies = [ "autocfg", "scopeguard", @@ -730,19 +621,17 @@ dependencies = [ [[package]] name = "log" -version = "0.4.17" +version = "0.4.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" -dependencies = [ - "cfg-if", -] +checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" [[package]] name = "matrixmultiply" -version = "0.3.2" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "add85d4dd35074e6fedc608f8c8f513a3548619a9024b751949ef0e8e45a4d84" +checksum = "7574c1cf36da4798ab73da5b215bbf444f50718207754cb522201d78d1cd0ff2" dependencies = [ + "autocfg", "rawpointer", ] @@ -752,22 +641,14 @@ version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" -[[package]] -name = "memoffset" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" -dependencies = [ - "autocfg", -] - [[package]] name = "miniz_oxide" -version = "0.6.2" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa" +checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" dependencies = [ "adler", + "simd-adler32", ] [[package]] @@ -794,75 +675,68 @@ dependencies = [ "typenum", ] -[[package]] -name = "nanorand" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a51313c5820b0b02bd422f4b44776fbf47961755c74ce64afc73bfad10226c3" -dependencies = [ - "getrandom 0.2.8", -] - [[package]] name = "napi" -version = "2.10.16" +version = "2.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c834726a0fddadaecd96799d82d44b7643faff195ed8316d518060621a53a618" +checksum = "2fc1cb00cde484640da9f01a124edbb013576a6ae9843b23857c940936b76d91" dependencies = [ - "bitflags", + "bitflags 2.4.1", "ctor", + "napi-derive", "napi-sys", "once_cell", - "thread_local", ] [[package]] name = "napi-build" -version = "2.0.1" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "882a73d9ef23e8dc2ebbffb6a6ae2ef467c0f18ac10711e4cc59c5485d41df0e" +checksum = "d4b4532cf86bfef556348ac65e561e3123879f0e7566cca6d43a6ff5326f13df" [[package]] name = "napi-derive" -version = "2.10.1" +version = "2.14.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f73dd4ddd118bd87756c72fead4c727dc4ee6ba3af3cd98d8490eb09b5a8573" +checksum = "e61bec1ee990ae3e9a5f443484c65fb38e571a898437f0ad283ed69c82fc59c0" dependencies = [ + "cfg-if", "convert_case", "napi-derive-backend", "proc-macro2", "quote", - "syn 1.0.107", + "syn 2.0.46", ] [[package]] name = "napi-derive-backend" -version = "1.0.43" +version = "1.0.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57e4e6bb1ee73ec3938a8dfd2ce81955954b8e48c3a40c839918a9735feb0d61" +checksum = "2314f777bc9cde51705d991c44466cee4de4a3f41c6d3d019fcbbebb5cdd47c4" dependencies = [ "convert_case", "once_cell", "proc-macro2", "quote", "regex", - "syn 1.0.107", + "semver", + "syn 2.0.46", ] [[package]] name = "napi-sys" -version = "2.2.3" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "166b5ef52a3ab5575047a9fe8d4a030cdd0f63c96f071cd6907674453b07bae3" +checksum = "2503fa6af34dc83fb74888df8b22afe933b58d37daf7d80424b1c60c68196b8b" dependencies = [ "libloading", ] [[package]] name = "num" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43db66d1170d347f9a065114077f7dccb00c1b9478c89384490a3425279a4606" +checksum = "b05180d69e3da0e530ba2a1dae5110317e49e3b7f3d41be227dc5f92e49ee7af" dependencies = [ "num-bigint", "num-complex", @@ -874,9 +748,9 @@ dependencies = [ [[package]] name = "num-bigint" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f" +checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" dependencies = [ "autocfg", "num-integer", @@ -885,9 +759,9 @@ dependencies = [ [[package]] name = "num-complex" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02e0d21255c828d6f128a1e41534206671e8c3ea0c62f32291e808dc82cff17d" +checksum = "1ba157ca0885411de85d6ca030ba7e2a83a28636056c7c699b07c8b6f7383214" dependencies = [ "num-traits", ] @@ -927,23 +801,13 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.15" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" +checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" dependencies = [ "autocfg", ] -[[package]] -name = "num_cpus" -version = "1.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" -dependencies = [ - "hermit-abi", - "libc", -] - [[package]] name = "once_cell" version = "1.19.0" @@ -970,24 +834,24 @@ dependencies = [ [[package]] name = "paste" -version = "1.0.11" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d01a5bd0424d00070b0098dd17ebca6f961a959dead1dbcbbbc1d1cd8d3deeba" +checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" [[package]] name = "phf" -version = "0.11.1" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "928c6535de93548188ef63bb7c4036bd415cd8f36ad25af44b9789b2ee72a48c" +checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" dependencies = [ "phf_shared", ] [[package]] name = "phf_codegen" -version = "0.11.1" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a56ac890c5e3ca598bbdeaa99964edb5b0258a583a9eb6ef4e89fc85d9224770" +checksum = "e8d39688d359e6b34654d328e262234662d16cc0f60ec8dcbe5e718709342a5a" dependencies = [ "phf_generator", "phf_shared", @@ -995,9 +859,9 @@ dependencies = [ [[package]] name = "phf_generator" -version = "0.11.1" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1181c94580fa345f50f19d738aaa39c0ed30a600d95cb2d3e23f94266f14fbf" +checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0" dependencies = [ "phf_shared", "rand 0.8.5", @@ -1005,9 +869,9 @@ dependencies = [ [[package]] name = "phf_shared" -version = "0.11.1" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1fb5f6f826b772a8d4c0394209441e7d37cbbb967ae9c7e0e8134365c9ee676" +checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b" dependencies = [ "siphasher", ] @@ -1018,34 +882,15 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5be167a7af36ee22fe3115051bc51f6e6c7054c9348e28deb4f49bd6f705a315" -[[package]] -name = "pin-project" -version = "1.0.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad29a609b6bcd67fee905812e544992d216af9d755757c05ed2d0e15a74c6ecc" -dependencies = [ - "pin-project-internal", -] - -[[package]] -name = "pin-project-internal" -version = "1.0.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "069bdb1e05adc7a8990dce9cc75370895fbe4e3d58b9b73bf1aee56359344a55" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.107", -] - [[package]] name = "png" -version = "0.17.7" +version = "0.17.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d708eaf860a19b19ce538740d2b4bdeeb8337fa53f7738455e706623ad5c638" +checksum = "dd75bf2d8dd3702b9707cdbc56a5b9ef42cec752eb8b3bafc01234558442aa64" dependencies = [ - "bitflags", + "bitflags 1.3.2", "crc32fast", + "fdeflate", "flate2", "miniz_oxide", ] @@ -1065,6 +910,15 @@ dependencies = [ "unicode-ident", ] +[[package]] +name = "qoi" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f6d64c71eb498fe9eae14ce4ec935c555749aef511cca85b5568910d6e48001" +dependencies = [ + "bytemuck", +] + [[package]] name = "quote" version = "1.0.35" @@ -1080,7 +934,7 @@ version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" dependencies = [ - "getrandom 0.1.16", + "getrandom", "libc", "rand_chacha", "rand_core 0.5.1", @@ -1112,7 +966,7 @@ version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" dependencies = [ - "getrandom 0.1.16", + "getrandom", ] [[package]] @@ -1147,9 +1001,9 @@ checksum = "60a357793950651c4ed0f3f52338f53b2f809f32d83a07f72909fa13e4c6c1e3" [[package]] name = "rayon" -version = "1.6.1" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6db3a213adf02b3bcfd2d3846bb41cb22857d131789e01df434fb7e7bc0759b7" +checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1" dependencies = [ "either", "rayon-core", @@ -1157,14 +1011,12 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.10.2" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "356a0625f1954f730c0201cdab48611198dc6ce21f4acff55089b5a78e6e835b" +checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed" dependencies = [ - "crossbeam-channel", "crossbeam-deque", "crossbeam-utils", - "num_cpus", ] [[package]] @@ -1181,16 +1033,10 @@ checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.4.3", + "regex-automata", "regex-syntax", ] -[[package]] -name = "regex-automata" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" - [[package]] name = "regex-automata" version = "0.4.3" @@ -1224,9 +1070,9 @@ dependencies = [ [[package]] name = "rgb" -version = "0.8.35" +version = "0.8.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7495acf66551cdb696b7711408144bcd3194fc78e32f3a09e809bfe7dd4a7ce3" +checksum = "05aaa8004b64fd573fc9d002f4e632d51ad4f026c2b5ba95fcb6c2f32c2c47d8" dependencies = [ "bytemuck", ] @@ -1297,47 +1143,55 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "110aacbea4a739b897ea5eb9ee6b14309ebc62bf5059138f9fd80d52a29ed11f" dependencies = [ "quote", - "syn 1.0.107", + "syn 1.0.109", ] [[package]] name = "ryu" -version = "1.0.12" +version = "1.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b4b9743ed687d4b4bcedf9ff5eaa7398495ae14e61cba0a295704edbc7decde" +checksum = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c" [[package]] name = "safe_arch" -version = "0.6.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "794821e4ccb0d9f979512f9c1973480123f9bd62a90d74ab0f9426fcf8f4a529" +checksum = "f398075ce1e6a179b46f51bd88d0598b92b00d3551f1a2d4ac49e771b56ac354" dependencies = [ "bytemuck", ] [[package]] -name = "scoped_threadpool" -version = "0.1.9" +name = "scopeguard" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d51f5df5af43ab3f1360b429fa5e0152ac5ce8c0bd6485cae490332e96846a8" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] -name = "scopeguard" -version = "1.1.0" +name = "semver" +version = "1.0.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" +checksum = "b97ed7a9823b74f99c7742f5336af7be5ecd3eeafcb1507d1fa93347b1d589b0" [[package]] -name = "scratch" -version = "1.0.3" +name = "serde" +version = "1.0.194" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddccb15bcce173023b3fedd9436f882a0739b8dfb45e4f6b6002bee5929f61b2" +checksum = "0b114498256798c94a0689e1a15fec6005dee8ac1f41de56404b67afc2a4b773" +dependencies = [ + "serde_derive", +] [[package]] -name = "serde" -version = "1.0.152" +name = "serde_derive" +version = "1.0.194" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb7d1f0d3021d347a83e556fc4683dea2ea09d87bccdf88ff5c12545d89d5efb" +checksum = "a3385e45322e8f9931410f01b3031ec534c3947d0e94c18049af4d9f9907d4e0" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.46", +] [[package]] name = "simba" @@ -1354,9 +1208,9 @@ dependencies = [ [[package]] name = "simd-adler32" -version = "0.3.4" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14a5df39617d7c8558154693a1bb8157a4aab8179209540cc0b10e5dc24e0b18" +checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" [[package]] name = "simplecss" @@ -1369,21 +1223,21 @@ dependencies = [ [[package]] name = "siphasher" -version = "0.3.10" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de" +checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" [[package]] name = "smallvec" -version = "1.10.0" +version = "1.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" +checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" [[package]] name = "spin" -version = "0.9.5" +version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dccf47db1b41fa1573ed27ccf5e08e3ca771cb994f776668c5ebda893b248fc" +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" dependencies = [ "lock_api", ] @@ -1415,9 +1269,9 @@ dependencies = [ [[package]] name = "syn" -version = "1.0.107" +version = "1.0.109" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f4064b5b16e03ae50984a5a8ed5d4f8803e6bc1fd170a3cda91a1be4b18e3f5" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" dependencies = [ "proc-macro2", "quote", @@ -1435,15 +1289,6 @@ dependencies = [ "unicode-ident", ] -[[package]] -name = "termcolor" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" -dependencies = [ - "winapi-util", -] - [[package]] name = "thiserror" version = "1.0.56" @@ -1464,29 +1309,11 @@ dependencies = [ "syn 2.0.46", ] -[[package]] -name = "thread_local" -version = "1.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5516c27b78311c50bf42c071425c560ac799b11c30b31f87e3081965fe5e0180" -dependencies = [ - "once_cell", -] - -[[package]] -name = "threadpool" -version = "1.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d050e60b33d41c19108b32cea32164033a9013fe3b46cbd4457559bfbf77afaa" -dependencies = [ - "num_cpus", -] - [[package]] name = "tiff" -version = "0.8.1" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7449334f9ff2baf290d55d73983a7d6fa15e01198faef72af07e2a8db851e471" +checksum = "6d172b0f4d3fba17ba89811858b9d3d97f928aece846475bbda076ca46736211" dependencies = [ "flate2", "jpeg-decoder", @@ -1527,15 +1354,15 @@ checksum = "7b3e06c9b9d80ed6b745c7159c40b311ad2916abb34a49e9be2653b90db0d8dd" [[package]] name = "typenum" -version = "1.16.0" +version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" [[package]] name = "unicode-ident" -version = "1.0.6" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84a22b9f218b40614adcb3f4ff08b703773ad44fa9423e4e0d346d5db86e4ebc" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] name = "unicode-segmentation" @@ -1543,12 +1370,6 @@ version = "1.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" -[[package]] -name = "unicode-width" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" - [[package]] name = "uriparse" version = "0.6.4" @@ -1615,17 +1436,11 @@ version = "0.9.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" -[[package]] -name = "wasi" -version = "0.11.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" - [[package]] name = "wasm-bindgen" -version = "0.2.84" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b" +checksum = "0ed0d4f68a3015cc185aff4db9506a015f4b96f95303897bfa23f846db54064e" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -1633,24 +1448,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.84" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95ce90fd5bcc06af55a641a86428ee4229e44e07033963a2290a8e241607ccb9" +checksum = "1b56f625e64f3a1084ded111c4d5f477df9f8c92df113852fa5a374dbda78826" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 1.0.107", + "syn 2.0.46", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-macro" -version = "0.2.84" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5" +checksum = "0162dbf37223cd2afce98f3d0785506dcb8d266223983e4b5b525859e6e182b2" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -1658,22 +1473,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.84" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6" +checksum = "f0eb82fcb7930ae6219a7ecfd55b217f5f0893484b7a13022ebb2b2bf20b5283" dependencies = [ "proc-macro2", "quote", - "syn 1.0.107", + "syn 2.0.46", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.84" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d" +checksum = "7ab9b36309365056cd639da3134bf87fa8f3d86008abf99e612384a6eecd459f" [[package]] name = "weezl" @@ -1683,58 +1498,60 @@ checksum = "9193164d4de03a926d909d3bc7c30543cecb35400c02114792c2cae20d5e2dbb" [[package]] name = "wide" -version = "0.7.6" +version = "0.7.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "feff0a412894d67223777b6cc8d68c0dab06d52d95e9890d5f2d47f10dd9366c" +checksum = "c68938b57b33da363195412cfc5fc37c9ed49aa9cfe2156fde64b8d2c9498242" dependencies = [ "bytemuck", "safe_arch", ] [[package]] -name = "winapi" -version = "0.3.9" +name = "windows-core" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "winapi-i686-pc-windows-gnu", - "winapi-x86_64-pc-windows-gnu", + "windows-targets 0.52.0", ] [[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" +name = "windows-sys" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" - -[[package]] -name = "winapi-util" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" dependencies = [ - "winapi", + "windows-targets 0.48.5", ] [[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" +name = "windows-targets" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" +dependencies = [ + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", +] [[package]] name = "windows-targets" -version = "0.48.5" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" +checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc", + "windows_aarch64_gnullvm 0.52.0", + "windows_aarch64_msvc 0.52.0", + "windows_i686_gnu 0.52.0", + "windows_i686_msvc 0.52.0", + "windows_x86_64_gnu 0.52.0", + "windows_x86_64_gnullvm 0.52.0", + "windows_x86_64_msvc 0.52.0", ] [[package]] @@ -1743,42 +1560,84 @@ version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" + [[package]] name = "windows_aarch64_msvc" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" + [[package]] name = "windows_i686_gnu" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" +[[package]] +name = "windows_i686_gnu" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" + [[package]] name = "windows_i686_msvc" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" +[[package]] +name = "windows_i686_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" + [[package]] name = "windows_x86_64_gnu" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" + [[package]] name = "windows_x86_64_gnullvm" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" + [[package]] name = "windows_x86_64_msvc" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" + [[package]] name = "xmlparser" version = "0.13.6" @@ -1793,9 +1652,9 @@ checksum = "ec7a2a501ed189703dba8b08142f057e887dfc4b2cc4db2d343ac6376ba3e0b9" [[package]] name = "zune-inflate" -version = "0.2.42" +version = "0.2.54" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c473377c11c4a3ac6a2758f944cd336678e9c977aa0abf54f6450cf77e902d6d" +checksum = "73ab332fe2f6680068f3582b16a24f90ad7096d5d39b974d1c0aff0125116f02" dependencies = [ "simd-adler32", ]