+88 -255

cli/Cargo.lock

··· 3 3 version = 4 4 4 5 5 [[package]] 6 6 - name = "abnf" 7 7 - version = "0.13.0" 8 8 - source = "registry+https://github.com/rust-lang/crates.io-index" 9 9 - checksum = "087113bd50d9adce24850eed5d0476c7d199d532fce8fab5173650331e09033a" 10 10 - dependencies = [ 11 11 - "abnf-core", 12 12 - "nom", 13 13 - ] 14 14 - 15 15 - [[package]] 16 16 - name = "abnf-core" 17 17 - version = "0.5.0" 18 18 - source = "registry+https://github.com/rust-lang/crates.io-index" 19 19 - checksum = "c44e09c43ae1c368fb91a03a566472d0087c26cf7e1b9e8e289c14ede681dd7d" 20 20 - dependencies = [ 21 21 - "nom", 22 22 - ] 23 23 - 24 24 - [[package]] 25 6 name = "addr2line" 26 7 version = "0.25.1" 27 8 source = "registry+https://github.com/rust-lang/crates.io-index" ··· 71 52 dependencies = [ 72 53 "alloc-no-stdlib", 73 54 ] 55 55 + 56 56 + [[package]] 57 57 + name = "allocator-api2" 58 58 + version = "0.2.21" 59 59 + source = "registry+https://github.com/rust-lang/crates.io-index" 60 60 + checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923" 74 61 75 62 [[package]] 76 63 name = "android_system_properties" ··· 379 366 ] 380 367 381 368 [[package]] 382 382 - name = "btree-range-map" 383 383 - version = "0.7.2" 384 384 - source = "registry+https://github.com/rust-lang/crates.io-index" 385 385 - checksum = "1be5c9672446d3800bcbcaabaeba121fe22f1fb25700c4562b22faf76d377c33" 386 386 - dependencies = [ 387 387 - "btree-slab", 388 388 - "cc-traits", 389 389 - "range-traits", 390 390 - "serde", 391 391 - "slab", 392 392 - ] 393 393 - 394 394 - [[package]] 395 395 - name = "btree-slab" 396 396 - version = "0.6.1" 397 397 - source = "registry+https://github.com/rust-lang/crates.io-index" 398 398 - checksum = "7a2b56d3029f075c4fa892428a098425b86cef5c89ae54073137ece416aef13c" 399 399 - dependencies = [ 400 400 - "cc-traits", 401 401 - "slab", 402 402 - "smallvec", 403 403 - ] 404 404 - 405 405 - [[package]] 406 369 name = "buf_redux" 407 370 version = "0.8.4" 408 371 source = "registry+https://github.com/rust-lang/crates.io-index" ··· 450 413 dependencies = [ 451 414 "find-msvc-tools", 452 415 "shlex", 453 453 - ] 454 454 - 455 455 - [[package]] 456 456 - name = "cc-traits" 457 457 - version = "2.0.0" 458 458 - source = "registry+https://github.com/rust-lang/crates.io-index" 459 459 - checksum = "060303ef31ef4a522737e1b1ab68c67916f2a787bb2f4f54f383279adba962b5" 460 460 - dependencies = [ 461 461 - "slab", 462 416 ] 463 417 464 418 [[package]] ··· 881 835 checksum = "ececcb659e7ba858fb4f10388c250a7252eb0a27373f1a72b8748afdd248e587" 882 836 dependencies = [ 883 837 "powerfmt", 884 884 - "serde_core", 885 838 ] 886 839 887 840 [[package]] ··· 954 907 "quote", 955 908 "syn 2.0.111", 956 909 ] 957 957 - 958 958 - [[package]] 959 959 - name = "dyn-clone" 960 960 - version = "1.0.20" 961 961 - source = "registry+https://github.com/rust-lang/crates.io-index" 962 962 - checksum = "d0881ea181b1df73ff77ffaaf9c7544ecc11e82fba9b5f27b262a3c73a332555" 963 910 964 911 [[package]] 965 912 name = "ecdsa" ··· 1101 1048 checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" 1102 1049 1103 1050 [[package]] 1051 1051 + name = "foldhash" 1052 1052 + version = "0.1.5" 1053 1053 + source = "registry+https://github.com/rust-lang/crates.io-index" 1054 1054 + checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2" 1055 1055 + 1056 1056 + [[package]] 1104 1057 name = "form_urlencoded" 1105 1058 version = "1.2.2" 1106 1059 source = "registry+https://github.com/rust-lang/crates.io-index" ··· 1365 1318 "futures-core", 1366 1319 "futures-sink", 1367 1320 "http", 1368 1368 - "indexmap 2.12.1", 1321 1321 + "indexmap", 1369 1322 "slab", 1370 1323 "tokio", 1371 1324 "tokio-util", ··· 1394 1347 1395 1348 [[package]] 1396 1349 name = "hashbrown" 1397 1397 - version = "0.12.3" 1350 1350 + version = "0.14.5" 1398 1351 source = "registry+https://github.com/rust-lang/crates.io-index" 1399 1399 - checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" 1352 1352 + checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" 1400 1353 1401 1354 [[package]] 1402 1355 name = "hashbrown" 1403 1403 - version = "0.14.5" 1356 1356 + version = "0.15.5" 1404 1357 source = "registry+https://github.com/rust-lang/crates.io-index" 1405 1405 - checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" 1358 1358 + checksum = "9229cfe53dfd69f0609a49f65461bd93001ea1ef889cd5529dd176593f5338a1" 1359 1359 + dependencies = [ 1360 1360 + "allocator-api2", 1361 1361 + "equivalent", 1362 1362 + "foldhash", 1363 1363 + ] 1406 1364 1407 1365 [[package]] 1408 1366 name = "hashbrown" ··· 1449 1407 checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" 1450 1408 1451 1409 [[package]] 1452 1452 - name = "hex_fmt" 1453 1453 - version = "0.3.0" 1454 1454 - source = "registry+https://github.com/rust-lang/crates.io-index" 1455 1455 - checksum = "b07f60793ff0a4d9cef0f18e63b5357e06209987153a64648c972c1e5aff336f" 1456 1456 - 1457 1457 - [[package]] 1458 1410 name = "hickory-proto" 1459 1411 version = "0.24.4" 1460 1412 source = "registry+https://github.com/rust-lang/crates.io-index" ··· 1789 1741 1790 1742 [[package]] 1791 1743 name = "indexmap" 1792 1792 - version = "1.9.3" 1793 1793 - source = "registry+https://github.com/rust-lang/crates.io-index" 1794 1794 - checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" 1795 1795 - dependencies = [ 1796 1796 - "autocfg", 1797 1797 - "hashbrown 0.12.3", 1798 1798 - "serde", 1799 1799 - ] 1800 1800 - 1801 1801 - [[package]] 1802 1802 - name = "indexmap" 1803 1744 version = "2.12.1" 1804 1745 source = "registry+https://github.com/rust-lang/crates.io-index" 1805 1746 checksum = "0ad4bb2b565bca0645f4d68c5c9af97fba094e9791da685bf83cb5f3ce74acf2" 1806 1747 dependencies = [ 1807 1748 "equivalent", 1808 1749 "hashbrown 0.16.1", 1809 1809 - "serde", 1810 1810 - "serde_core", 1811 1750 ] 1812 1751 1813 1752 [[package]] ··· 1824 1763 ] 1825 1764 1826 1765 [[package]] 1827 1827 - name = "indoc" 1828 1828 - version = "2.0.7" 1829 1829 - source = "registry+https://github.com/rust-lang/crates.io-index" 1830 1830 - checksum = "79cf5c93f93228cf8efb3ba362535fb11199ac548a09ce117c9b1adc3030d706" 1831 1831 - dependencies = [ 1832 1832 - "rustversion", 1833 1833 - ] 1834 1834 - 1835 1835 - [[package]] 1836 1766 name = "inventory" 1837 1767 version = "0.3.21" 1838 1768 source = "registry+https://github.com/rust-lang/crates.io-index" ··· 1900 1830 1901 1831 [[package]] 1902 1832 name = "jacquard" 1903 1903 - version = "0.9.4" 1904 1904 - source = "git+https://tangled.org/nekomimi.pet/jacquard#69a1552424ffa439ea1022aa8e3f311ed77ab4df" 1833 1833 + version = "0.9.5" 1834 1834 + source = "git+https://tangled.org/nonbinary.computer/jacquard#5bcf7f8e87324b8e67fc273c678d0490c9c6d15b" 1905 1835 dependencies = [ 1906 1836 "bytes", 1907 1837 "getrandom 0.2.16", ··· 1917 1847 "regex", 1918 1848 "regex-lite", 1919 1849 "reqwest", 1920 1920 - "ring", 1921 1850 "serde", 1922 1851 "serde_html_form", 1923 1852 "serde_json", ··· 1931 1860 1932 1861 [[package]] 1933 1862 name = "jacquard-api" 1934 1934 - version = "0.9.2" 1935 1935 - source = "git+https://tangled.org/nekomimi.pet/jacquard#69a1552424ffa439ea1022aa8e3f311ed77ab4df" 1863 1863 + version = "0.9.5" 1864 1864 + source = "git+https://tangled.org/nonbinary.computer/jacquard#5bcf7f8e87324b8e67fc273c678d0490c9c6d15b" 1936 1865 dependencies = [ 1937 1866 "bon", 1938 1867 "bytes", ··· 1950 1879 1951 1880 [[package]] 1952 1881 name = "jacquard-common" 1953 1953 - version = "0.9.2" 1954 1954 - source = "git+https://tangled.org/nekomimi.pet/jacquard#69a1552424ffa439ea1022aa8e3f311ed77ab4df" 1882 1882 + version = "0.9.5" 1883 1883 + source = "git+https://tangled.org/nonbinary.computer/jacquard#5bcf7f8e87324b8e67fc273c678d0490c9c6d15b" 1955 1884 dependencies = [ 1956 1885 "base64 0.22.1", 1957 1886 "bon", 1958 1887 "bytes", 1959 1888 "chrono", 1960 1889 "ciborium", 1890 1890 + "ciborium-io", 1961 1891 "cid", 1962 1892 "futures", 1963 1893 "getrandom 0.2.16", 1964 1894 "getrandom 0.3.4", 1895 1895 + "hashbrown 0.15.5", 1965 1896 "http", 1966 1897 "ipld-core", 1967 1898 "k256", 1968 1968 - "langtag", 1899 1899 + "maitake-sync", 1969 1900 "miette", 1970 1901 "multibase", 1971 1902 "multihash", 1972 1903 "n0-future 0.1.3", 1973 1904 "ouroboros", 1905 1905 + "oxilangtag", 1974 1906 "p256", 1975 1907 "postcard", 1976 1908 "rand 0.9.2", 1977 1909 "regex", 1910 1910 + "regex-automata", 1978 1911 "regex-lite", 1979 1912 "reqwest", 1980 1980 - "ring", 1981 1913 "serde", 1982 1914 "serde_bytes", 1983 1915 "serde_html_form", ··· 1985 1917 "serde_json", 1986 1918 "signature", 1987 1919 "smol_str", 1920 1920 + "spin 0.10.0", 1988 1921 "thiserror 2.0.17", 1989 1922 "tokio", 1990 1923 "tokio-tungstenite-wasm", ··· 1995 1928 1996 1929 [[package]] 1997 1930 name = "jacquard-derive" 1998 1998 - version = "0.9.4" 1999 1999 - source = "git+https://tangled.org/nekomimi.pet/jacquard#69a1552424ffa439ea1022aa8e3f311ed77ab4df" 1931 1931 + version = "0.9.5" 1932 1932 + source = "git+https://tangled.org/nonbinary.computer/jacquard#5bcf7f8e87324b8e67fc273c678d0490c9c6d15b" 2000 1933 dependencies = [ 2001 1934 "heck 0.5.0", 2002 1935 "jacquard-lexicon", ··· 2007 1940 2008 1941 [[package]] 2009 1942 name = "jacquard-identity" 2010 2010 - version = "0.9.2" 2011 2011 - source = "git+https://tangled.org/nekomimi.pet/jacquard#69a1552424ffa439ea1022aa8e3f311ed77ab4df" 1943 1943 + version = "0.9.5" 1944 1944 + source = "git+https://tangled.org/nonbinary.computer/jacquard#5bcf7f8e87324b8e67fc273c678d0490c9c6d15b" 2012 1945 dependencies = [ 2013 1946 "bon", 2014 1947 "bytes", ··· 2018 1951 "jacquard-common", 2019 1952 "jacquard-lexicon", 2020 1953 "miette", 2021 2021 - "mini-moka", 1954 1954 + "mini-moka-wasm", 2022 1955 "n0-future 0.1.3", 2023 1956 "percent-encoding", 2024 1957 "reqwest", 2025 2025 - "ring", 2026 1958 "serde", 2027 1959 "serde_html_form", 2028 1960 "serde_json", ··· 2035 1967 2036 1968 [[package]] 2037 1969 name = "jacquard-lexicon" 2038 2038 - version = "0.9.2" 2039 2039 - source = "git+https://tangled.org/nekomimi.pet/jacquard#69a1552424ffa439ea1022aa8e3f311ed77ab4df" 1970 1970 + version = "0.9.5" 1971 1971 + source = "git+https://tangled.org/nonbinary.computer/jacquard#5bcf7f8e87324b8e67fc273c678d0490c9c6d15b" 2040 1972 dependencies = [ 2041 1973 "cid", 2042 1974 "dashmap", ··· 2061 1993 2062 1994 [[package]] 2063 1995 name = "jacquard-oauth" 2064 2064 - version = "0.9.2" 2065 2065 - source = "git+https://tangled.org/nekomimi.pet/jacquard#69a1552424ffa439ea1022aa8e3f311ed77ab4df" 1996 1996 + version = "0.9.6" 1997 1997 + source = "git+https://tangled.org/nonbinary.computer/jacquard#5bcf7f8e87324b8e67fc273c678d0490c9c6d15b" 2066 1998 dependencies = [ 2067 1999 "base64 0.22.1", 2068 2000 "bytes", ··· 2077 2009 "miette", 2078 2010 "p256", 2079 2011 "rand 0.8.5", 2080 2080 - "ring", 2081 2012 "rouille", 2082 2013 "serde", 2083 2014 "serde_html_form", ··· 2172 2103 ] 2173 2104 2174 2105 [[package]] 2175 2175 - name = "langtag" 2176 2176 - version = "0.4.0" 2177 2177 - source = "registry+https://github.com/rust-lang/crates.io-index" 2178 2178 - checksum = "9ecb4c689a30e48ebeaa14237f34037e300dd072e6ad21a9ec72e810ff3c6600" 2179 2179 - dependencies = [ 2180 2180 - "serde", 2181 2181 - "static-regular-grammar", 2182 2182 - "thiserror 1.0.69", 2183 2183 - ] 2184 2184 - 2185 2185 - [[package]] 2186 2106 name = "lazy_static" 2187 2107 version = "1.5.0" 2188 2108 source = "registry+https://github.com/rust-lang/crates.io-index" ··· 2282 2202 checksum = "c41e0c4fef86961ac6d6f8a82609f55f31b05e4fce149ac5710e439df7619ba4" 2283 2203 2284 2204 [[package]] 2205 2205 + name = "maitake-sync" 2206 2206 + version = "0.1.2" 2207 2207 + source = "registry+https://github.com/rust-lang/crates.io-index" 2208 2208 + checksum = "6816ab14147f80234c675b80ed6dc4f440d8a1cefc158e766067aedb84c0bcd5" 2209 2209 + dependencies = [ 2210 2210 + "cordyceps", 2211 2211 + "loom", 2212 2212 + "mycelium-bitfield", 2213 2213 + "pin-project", 2214 2214 + "portable-atomic", 2215 2215 + ] 2216 2216 + 2217 2217 + [[package]] 2285 2218 name = "markup5ever" 2286 2219 version = "0.12.1" 2287 2220 source = "registry+https://github.com/rust-lang/crates.io-index" ··· 2386 2319 ] 2387 2320 2388 2321 [[package]] 2389 2389 - name = "mini-moka" 2322 2322 + name = "mini-moka-wasm" 2390 2323 version = "0.10.99" 2391 2391 - source = "git+https://tangled.org/nekomimi.pet/jacquard#69a1552424ffa439ea1022aa8e3f311ed77ab4df" 2324 2324 + source = "git+https://tangled.org/nonbinary.computer/jacquard#5bcf7f8e87324b8e67fc273c678d0490c9c6d15b" 2392 2325 dependencies = [ 2393 2326 "crossbeam-channel", 2394 2327 "crossbeam-utils", ··· 2398 2331 "triomphe", 2399 2332 "web-time", 2400 2333 ] 2401 2401 - 2402 2402 - [[package]] 2403 2403 - name = "minimal-lexical" 2404 2404 - version = "0.2.1" 2405 2405 - source = "registry+https://github.com/rust-lang/crates.io-index" 2406 2406 - checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" 2407 2334 2408 2335 [[package]] 2409 2336 name = "miniz_oxide" ··· 2468 2395 ] 2469 2396 2470 2397 [[package]] 2398 2398 + name = "mycelium-bitfield" 2399 2399 + version = "0.1.5" 2400 2400 + source = "registry+https://github.com/rust-lang/crates.io-index" 2401 2401 + checksum = "24e0cc5e2c585acbd15c5ce911dff71e1f4d5313f43345873311c4f5efd741cc" 2402 2402 + 2403 2403 + [[package]] 2471 2404 name = "n0-future" 2472 2405 version = "0.1.3" 2473 2406 source = "registry+https://github.com/rust-lang/crates.io-index" ··· 2520 2453 version = "1.0.6" 2521 2454 source = "registry+https://github.com/rust-lang/crates.io-index" 2522 2455 checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086" 2523 2523 - 2524 2524 - [[package]] 2525 2525 - name = "nom" 2526 2526 - version = "7.1.3" 2527 2527 - source = "registry+https://github.com/rust-lang/crates.io-index" 2528 2528 - checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" 2529 2529 - dependencies = [ 2530 2530 - "memchr", 2531 2531 - "minimal-lexical", 2532 2532 - ] 2533 2456 2534 2457 [[package]] 2535 2458 name = "nu-ansi-term" ··· 2706 2629 checksum = "9c6901729fa79e91a0913333229e9ca5dc725089d1c363b2f4b4760709dc4a52" 2707 2630 2708 2631 [[package]] 2632 2632 + name = "oxilangtag" 2633 2633 + version = "0.1.5" 2634 2634 + source = "registry+https://github.com/rust-lang/crates.io-index" 2635 2635 + checksum = "23f3f87617a86af77fa3691e6350483e7154c2ead9f1261b75130e21ca0f8acb" 2636 2636 + dependencies = [ 2637 2637 + "serde", 2638 2638 + ] 2639 2639 + 2640 2640 + [[package]] 2709 2641 name = "p256" 2710 2642 version = "0.13.2" 2711 2643 source = "registry+https://github.com/rust-lang/crates.io-index" ··· 2931 2863 ] 2932 2864 2933 2865 [[package]] 2934 2934 - name = "proc-macro-error" 2935 2935 - version = "1.0.4" 2936 2936 - source = "registry+https://github.com/rust-lang/crates.io-index" 2937 2937 - checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" 2938 2938 - dependencies = [ 2939 2939 - "proc-macro-error-attr", 2940 2940 - "proc-macro2", 2941 2941 - "quote", 2942 2942 - "syn 1.0.109", 2943 2943 - "version_check", 2944 2944 - ] 2945 2945 - 2946 2946 - [[package]] 2947 2947 - name = "proc-macro-error-attr" 2948 2948 - version = "1.0.4" 2949 2949 - source = "registry+https://github.com/rust-lang/crates.io-index" 2950 2950 - checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" 2951 2951 - dependencies = [ 2952 2952 - "proc-macro2", 2953 2953 - "quote", 2954 2954 - "version_check", 2955 2955 - ] 2956 2956 - 2957 2957 - [[package]] 2958 2866 name = "proc-macro2" 2959 2867 version = "1.0.103" 2960 2868 source = "registry+https://github.com/rust-lang/crates.io-index" ··· 3112 3020 ] 3113 3021 3114 3022 [[package]] 3115 3115 - name = "range-traits" 3116 3116 - version = "0.3.2" 3117 3117 - source = "registry+https://github.com/rust-lang/crates.io-index" 3118 3118 - checksum = "d20581732dd76fa913c7dff1a2412b714afe3573e94d41c34719de73337cc8ab" 3119 3119 - 3120 3120 - [[package]] 3121 3023 name = "redox_syscall" 3122 3024 version = "0.5.18" 3123 3025 source = "registry+https://github.com/rust-lang/crates.io-index" ··· 3138 3040 ] 3139 3041 3140 3042 [[package]] 3141 3141 - name = "ref-cast" 3142 3142 - version = "1.0.25" 3143 3143 - source = "registry+https://github.com/rust-lang/crates.io-index" 3144 3144 - checksum = "f354300ae66f76f1c85c5f84693f0ce81d747e2c3f21a45fef496d89c960bf7d" 3145 3145 - dependencies = [ 3146 3146 - "ref-cast-impl", 3147 3147 - ] 3148 3148 - 3149 3149 - [[package]] 3150 3150 - name = "ref-cast-impl" 3151 3151 - version = "1.0.25" 3152 3152 - source = "registry+https://github.com/rust-lang/crates.io-index" 3153 3153 - checksum = "b7186006dcb21920990093f30e3dea63b7d6e977bf1256be20c3563a5db070da" 3154 3154 - dependencies = [ 3155 3155 - "proc-macro2", 3156 3156 - "quote", 3157 3157 - "syn 2.0.111", 3158 3158 - ] 3159 3159 - 3160 3160 - [[package]] 3161 3043 name = "regex" 3162 3044 version = "1.12.2" 3163 3045 source = "registry+https://github.com/rust-lang/crates.io-index" ··· 3429 3311 ] 3430 3312 3431 3313 [[package]] 3432 3432 - name = "schemars" 3433 3433 - version = "0.9.0" 3434 3434 - source = "registry+https://github.com/rust-lang/crates.io-index" 3435 3435 - checksum = "4cd191f9397d57d581cddd31014772520aa448f65ef991055d7f61582c65165f" 3436 3436 - dependencies = [ 3437 3437 - "dyn-clone", 3438 3438 - "ref-cast", 3439 3439 - "serde", 3440 3440 - "serde_json", 3441 3441 - ] 3442 3442 - 3443 3443 - [[package]] 3444 3444 - name = "schemars" 3445 3445 - version = "1.1.0" 3446 3446 - source = "registry+https://github.com/rust-lang/crates.io-index" 3447 3447 - checksum = "9558e172d4e8533736ba97870c4b2cd63f84b382a3d6eb063da41b91cce17289" 3448 3448 - dependencies = [ 3449 3449 - "dyn-clone", 3450 3450 - "ref-cast", 3451 3451 - "serde", 3452 3452 - "serde_json", 3453 3453 - ] 3454 3454 - 3455 3455 - [[package]] 3456 3314 name = "scoped-tls" 3457 3315 version = "1.0.1" 3458 3316 source = "registry+https://github.com/rust-lang/crates.io-index" ··· 3555 3413 3556 3414 [[package]] 3557 3415 name = "serde_html_form" 3558 3558 - version = "0.2.8" 3416 3416 + version = "0.3.2" 3559 3417 source = "registry+https://github.com/rust-lang/crates.io-index" 3560 3560 - checksum = "b2f2d7ff8a2140333718bb329f5c40fc5f0865b84c426183ce14c97d2ab8154f" 3418 3418 + checksum = "2acf96b1d9364968fce46ebb548f1c0e1d7eceae27bdff73865d42e6c7369d94" 3561 3419 dependencies = [ 3562 3420 "form_urlencoded", 3563 3563 - "indexmap 2.12.1", 3421 3421 + "indexmap", 3564 3422 "itoa", 3565 3565 - "ryu", 3566 3423 "serde_core", 3567 3424 ] 3568 3425 ··· 3634 3491 "base64 0.22.1", 3635 3492 "chrono", 3636 3493 "hex", 3637 3637 - "indexmap 1.9.3", 3638 3638 - "indexmap 2.12.1", 3639 3639 - "schemars 0.9.0", 3640 3640 - "schemars 1.1.0", 3641 3494 "serde_core", 3642 3495 "serde_json", 3643 3496 "serde_with_macros", ··· 3811 3664 version = "1.2.1" 3812 3665 source = "registry+https://github.com/rust-lang/crates.io-index" 3813 3666 checksum = "6ce2be8dc25455e1f91df71bfa12ad37d7af1092ae736f3a6cd0e37bc7810596" 3814 3814 - 3815 3815 - [[package]] 3816 3816 - name = "static-regular-grammar" 3817 3817 - version = "2.0.2" 3818 3818 - source = "registry+https://github.com/rust-lang/crates.io-index" 3819 3819 - checksum = "4f4a6c40247579acfbb138c3cd7de3dab113ab4ac6227f1b7de7d626ee667957" 3820 3820 - dependencies = [ 3821 3821 - "abnf", 3822 3822 - "btree-range-map", 3823 3823 - "ciborium", 3824 3824 - "hex_fmt", 3825 3825 - "indoc", 3826 3826 - "proc-macro-error", 3827 3827 - "proc-macro2", 3828 3828 - "quote", 3829 3829 - "serde", 3830 3830 - "sha2", 3831 3831 - "syn 2.0.111", 3832 3832 - "thiserror 1.0.69", 3833 3833 - ] 3834 3667 3835 3668 [[package]] 3836 3669 name = "static_assertions" ··· 4074 3907 checksum = "91e7d9e3bb61134e77bde20dd4825b97c010155709965fedf0f49bb138e52a9d" 4075 3908 dependencies = [ 4076 3909 "deranged", 4077 4077 - "itoa", 4078 3910 "libc", 4079 3911 "num-conv", 4080 3912 "num_threads", 4081 3913 "powerfmt", 4082 3914 "serde", 4083 3915 "time-core", 4084 4084 - "time-macros", 4085 3916 ] 4086 3917 4087 3918 [[package]] ··· 4089 3920 version = "0.1.6" 4090 3921 source = "registry+https://github.com/rust-lang/crates.io-index" 4091 3922 checksum = "40868e7c1d2f0b8d73e4a8c7f0ff63af4f6d19be117e90bd73eb1d62cf831c6b" 4092 4092 - 4093 4093 - [[package]] 4094 4094 - name = "time-macros" 4095 4095 - version = "0.2.24" 4096 4096 - source = "registry+https://github.com/rust-lang/crates.io-index" 4097 4097 - checksum = "30cfb0125f12d9c277f35663a0a33f8c30190f4e4574868a330595412d34ebf3" 4098 4098 - dependencies = [ 4099 4099 - "num-conv", 4100 4100 - "time-core", 4101 4101 - ] 4102 3923 4103 3924 [[package]] 4104 3925 name = "tiny_http" ··· 5184 5005 "tower-http", 5185 5006 "url", 5186 5007 "walkdir", 5008 5008 + "wisp-lexicons", 5009 5009 + ] 5010 5010 + 5011 5011 + [[package]] 5012 5012 + name = "wisp-lexicons" 5013 5013 + version = "0.1.0" 5014 5014 + dependencies = [ 5015 5015 + "jacquard-common", 5016 5016 + "jacquard-derive", 5017 5017 + "jacquard-lexicon", 5018 5018 + "rustversion", 5019 5019 + "serde", 5187 5020 ] 5188 5021 5189 5022 [[package]]

+8 -7

cli/Cargo.toml

··· 8 8 place_wisp = [] 9 9 10 10 [dependencies] 11 11 - jacquard = { git = "https://tangled.org/nekomimi.pet/jacquard", features = ["loopback"] } 12 12 - jacquard-oauth = { git = "https://tangled.org/nekomimi.pet/jacquard" } 13 13 - jacquard-api = { git = "https://tangled.org/nekomimi.pet/jacquard", features = ["streaming"] } 14 14 - jacquard-common = { git = "https://tangled.org/nekomimi.pet/jacquard", features = ["websocket"] } 15 15 - jacquard-identity = { git = "https://tangled.org/nekomimi.pet/jacquard", features = ["dns"] } 16 16 - jacquard-derive = { git = "https://tangled.org/nekomimi.pet/jacquard" } 17 17 - jacquard-lexicon = { git = "https://tangled.org/nekomimi.pet/jacquard" } 11 11 + jacquard = { git = "https://tangled.org/nonbinary.computer/jacquard", features = ["loopback"] } 12 12 + jacquard-oauth = { git = "https://tangled.org/nonbinary.computer/jacquard" } 13 13 + jacquard-api = { git = "https://tangled.org/nonbinary.computer/jacquard", features = ["streaming"] } 14 14 + jacquard-common = { git = "https://tangled.org/nonbinary.computer/jacquard", features = ["websocket"] } 15 15 + jacquard-identity = { git = "https://tangled.org/nonbinary.computer/jacquard", features = ["dns"] } 16 16 + jacquard-derive = { git = "https://tangled.org/nonbinary.computer/jacquard" } 17 17 + jacquard-lexicon = { git = "https://tangled.org/nonbinary.computer/jacquard" } 18 18 + wisp-lexicons = { path = "crates/lexicons" } 18 19 #jacquard = { path = "../../jacquard/crates/jacquard", features = ["loopback"] } 19 20 #jacquard-oauth = { path = "../../jacquard/crates/jacquard-oauth" } 20 21 #jacquard-api = { path = "../../jacquard/crates/jacquard-api", features = ["streaming"] }

+15

cli/crates/lexicons/Cargo.toml

··· 1 1 + [package] 2 2 + name = "wisp-lexicons" 3 3 + version = "0.1.0" 4 4 + edition = "2024" 5 5 + 6 6 + [features] 7 7 + default = ["place_wisp"] 8 8 + place_wisp = [] 9 9 + 10 10 + [dependencies] 11 11 + jacquard-common = { git = "https://tangled.org/nonbinary.computer/jacquard" } 12 12 + jacquard-derive = { git = "https://tangled.org/nonbinary.computer/jacquard" } 13 13 + jacquard-lexicon = { git = "https://tangled.org/nonbinary.computer/jacquard" } 14 14 + serde = { version = "1.0", features = ["derive"] } 15 15 + rustversion = "1.0"

+1 -1

cli/src/blob_map.rs

··· 2 2 use jacquard_common::IntoStatic; 3 3 use std::collections::HashMap; 4 4 5 5 - use crate::place_wisp::fs::{Directory, EntryNode}; 5 5 + use wisp_lexicons::place_wisp::fs::{Directory, EntryNode}; 6 6 7 7 /// Extract blob information from a directory tree 8 8 /// Returns a map of file paths to their blob refs and CIDs

cli/src/builder_types.rs cli/crates/lexicons/src/builder_types.rs

+2

cli/src/lib.rs cli/crates/lexicons/src/lib.rs

··· 1 1 + extern crate alloc; 2 2 + 1 3 // @generated by jacquard-lexicon. DO NOT EDIT. 2 4 // 3 5 // This file was automatically generated from Lexicon schemas.

+13 -15

cli/src/main.rs

··· 1 1 - mod builder_types; 2 2 - mod place_wisp; 3 1 mod cid; 4 2 mod blob_map; 5 3 mod metadata; ··· 28 26 use futures::stream::{self, StreamExt}; 29 27 use indicatif::{ProgressBar, ProgressStyle, MultiProgress}; 30 28 31 31 - use place_wisp::fs::*; 32 32 - use place_wisp::settings::*; 29 29 + use wisp_lexicons::place_wisp::fs::*; 30 30 + use wisp_lexicons::place_wisp::settings::*; 33 31 34 32 /// Maximum number of concurrent file uploads to the PDS 35 33 const MAX_CONCURRENT_UPLOADS: usize = 2; ··· 512 510 let chunk_file_count = subfs_utils::count_files_in_directory(chunk); 513 511 let chunk_size = subfs_utils::estimate_directory_size(chunk); 514 512 515 515 - let chunk_manifest = crate::place_wisp::subfs::SubfsRecord::new() 513 513 + let chunk_manifest = wisp_lexicons::place_wisp::subfs::SubfsRecord::new() 516 514 .root(convert_fs_dir_to_subfs_dir(chunk.clone())) 517 515 .file_count(Some(chunk_file_count as i64)) 518 516 .created_at(Datetime::now()) ··· 535 533 // Each chunk reference MUST have flat: true to merge chunk contents 536 534 println!(" → Creating parent subfs with {} chunk references...", chunk_uris.len()); 537 535 use jacquard_common::CowStr; 538 538 - use crate::place_wisp::fs::{Subfs}; 536 536 + use wisp_lexicons::place_wisp::fs::{Subfs}; 539 537 540 538 // Convert to fs::Subfs (which has the 'flat' field) instead of subfs::Subfs 541 539 let parent_entries_fs: Vec<Entry> = chunk_uris.iter().enumerate().map(|(i, (uri, _))| { ··· 565 563 let parent_tid = Tid::now_0(); 566 564 let parent_rkey = parent_tid.to_string(); 567 565 568 568 - let parent_manifest = crate::place_wisp::subfs::SubfsRecord::new() 566 566 + let parent_manifest = wisp_lexicons::place_wisp::subfs::SubfsRecord::new() 569 567 .root(parent_root_subfs) 570 568 .file_count(Some(largest_dir.file_count as i64)) 571 569 .created_at(Datetime::now()) ··· 584 582 let subfs_tid = Tid::now_0(); 585 583 let subfs_rkey = subfs_tid.to_string(); 586 584 587 587 - let subfs_manifest = crate::place_wisp::subfs::SubfsRecord::new() 585 585 + let subfs_manifest = wisp_lexicons::place_wisp::subfs::SubfsRecord::new() 588 586 .root(convert_fs_dir_to_subfs_dir(largest_dir.directory.clone())) 589 587 .file_count(Some(largest_dir.file_count as i64)) 590 588 .created_at(Datetime::now()) ··· 952 950 953 951 /// Convert fs::Directory to subfs::Directory 954 952 /// They have the same structure, but different types 955 955 - fn convert_fs_dir_to_subfs_dir(fs_dir: place_wisp::fs::Directory<'static>) -> place_wisp::subfs::Directory<'static> { 956 956 - use place_wisp::subfs::{Directory as SubfsDirectory, Entry as SubfsEntry, EntryNode as SubfsEntryNode, File as SubfsFile}; 953 953 + fn convert_fs_dir_to_subfs_dir(fs_dir: wisp_lexicons::place_wisp::fs::Directory<'static>) -> wisp_lexicons::place_wisp::subfs::Directory<'static> { 954 954 + use wisp_lexicons::place_wisp::subfs::{Directory as SubfsDirectory, Entry as SubfsEntry, EntryNode as SubfsEntryNode, File as SubfsFile}; 957 955 958 956 let subfs_entries: Vec<SubfsEntry> = fs_dir.entries.into_iter().map(|entry| { 959 957 let node = match entry.node { 960 960 - place_wisp::fs::EntryNode::File(file) => { 958 958 + wisp_lexicons::place_wisp::fs::EntryNode::File(file) => { 961 959 SubfsEntryNode::File(Box::new(SubfsFile::new() 962 960 .r#type(file.r#type) 963 961 .blob(file.blob) ··· 966 964 .base64(file.base64) 967 965 .build())) 968 966 } 969 969 - place_wisp::fs::EntryNode::Directory(dir) => { 967 967 + wisp_lexicons::place_wisp::fs::EntryNode::Directory(dir) => { 970 968 SubfsEntryNode::Directory(Box::new(convert_fs_dir_to_subfs_dir(*dir))) 971 969 } 972 972 - place_wisp::fs::EntryNode::Subfs(subfs) => { 970 970 + wisp_lexicons::place_wisp::fs::EntryNode::Subfs(subfs) => { 973 971 // Nested subfs in the directory we're converting 974 972 // Note: subfs::Subfs doesn't have the 'flat' field - that's only in fs::Subfs 975 975 - SubfsEntryNode::Subfs(Box::new(place_wisp::subfs::Subfs::new() 973 973 + SubfsEntryNode::Subfs(Box::new(wisp_lexicons::place_wisp::subfs::Subfs::new() 976 974 .r#type(subfs.r#type) 977 975 .subject(subfs.subject) 978 976 .build())) 979 977 } 980 980 - place_wisp::fs::EntryNode::Unknown(unknown) => { 978 978 + wisp_lexicons::place_wisp::fs::EntryNode::Unknown(unknown) => { 981 979 SubfsEntryNode::Unknown(unknown) 982 980 } 983 981 };

-9

cli/src/mod.rs

··· 1 1 - // @generated by jacquard-lexicon. DO NOT EDIT. 2 2 - // 3 3 - // This file was automatically generated from Lexicon schemas. 4 4 - // Any manual changes will be overwritten on the next regeneration. 5 5 - 6 6 - pub mod builder_types; 7 7 - 8 8 - #[cfg(feature = "place_wisp")] 9 9 - pub mod place_wisp;

cli/src/place_wisp.rs cli/crates/lexicons/src/place_wisp.rs

+34 -34

cli/src/place_wisp/fs.rs cli/crates/lexicons/src/place_wisp/fs.rs

··· 554 554 } 555 555 /// State trait tracking which required fields have been set 556 556 pub trait State: sealed::Sealed { 557 557 - type Name; 558 557 type Node; 558 558 + type Name; 559 559 } 560 560 /// Empty state - all required fields are unset 561 561 pub struct Empty(()); 562 562 impl sealed::Sealed for Empty {} 563 563 impl State for Empty { 564 564 - type Name = Unset; 565 564 type Node = Unset; 566 566 - } 567 567 - ///State transition - sets the `name` field to Set 568 568 - pub struct SetName<S: State = Empty>(PhantomData<fn() -> S>); 569 569 - impl<S: State> sealed::Sealed for SetName<S> {} 570 570 - impl<S: State> State for SetName<S> { 571 571 - type Name = Set<members::name>; 572 572 - type Node = S::Node; 565 565 + type Name = Unset; 573 566 } 574 567 ///State transition - sets the `node` field to Set 575 568 pub struct SetNode<S: State = Empty>(PhantomData<fn() -> S>); 576 569 impl<S: State> sealed::Sealed for SetNode<S> {} 577 570 impl<S: State> State for SetNode<S> { 578 578 - type Name = S::Name; 579 571 type Node = Set<members::node>; 572 572 + type Name = S::Name; 573 573 + } 574 574 + ///State transition - sets the `name` field to Set 575 575 + pub struct SetName<S: State = Empty>(PhantomData<fn() -> S>); 576 576 + impl<S: State> sealed::Sealed for SetName<S> {} 577 577 + impl<S: State> State for SetName<S> { 578 578 + type Node = S::Node; 579 579 + type Name = Set<members::name>; 580 580 } 581 581 /// Marker types for field names 582 582 #[allow(non_camel_case_types)] 583 583 pub mod members { 584 584 + ///Marker type for the `node` field 585 585 + pub struct node(()); 584 586 ///Marker type for the `name` field 585 587 pub struct name(()); 586 586 - ///Marker type for the `node` field 587 587 - pub struct node(()); 588 588 } 589 589 } 590 590 ··· 657 657 impl<'a, S> EntryBuilder<'a, S> 658 658 where 659 659 S: entry_state::State, 660 660 - S::Name: entry_state::IsSet, 661 660 S::Node: entry_state::IsSet, 661 661 + S::Name: entry_state::IsSet, 662 662 { 663 663 /// Build the final struct 664 664 pub fn build(self) -> Entry<'a> { ··· 749 749 pub struct File<'a> { 750 750 /// True if blob content is base64-encoded (used to bypass PDS content sniffing) 751 751 #[serde(skip_serializing_if = "std::option::Option::is_none")] 752 752 - pub base64: Option<bool>, 752 752 + pub base64: std::option::Option<bool>, 753 753 /// Content blob ref 754 754 #[serde(borrow)] 755 755 pub blob: jacquard_common::types::blob::BlobRef<'a>, 756 756 /// Content encoding (e.g., gzip for compressed files) 757 757 #[serde(skip_serializing_if = "std::option::Option::is_none")] 758 758 #[serde(borrow)] 759 759 - pub encoding: Option<jacquard_common::CowStr<'a>>, 759 759 + pub encoding: std::option::Option<jacquard_common::CowStr<'a>>, 760 760 /// Original MIME type before compression 761 761 #[serde(skip_serializing_if = "std::option::Option::is_none")] 762 762 #[serde(borrow)] 763 763 - pub mime_type: Option<jacquard_common::CowStr<'a>>, 763 763 + pub mime_type: std::option::Option<jacquard_common::CowStr<'a>>, 764 764 #[serde(borrow)] 765 765 pub r#type: jacquard_common::CowStr<'a>, 766 766 } ··· 994 994 pub struct Fs<'a> { 995 995 pub created_at: jacquard_common::types::string::Datetime, 996 996 #[serde(skip_serializing_if = "std::option::Option::is_none")] 997 997 - pub file_count: Option<i64>, 997 997 + pub file_count: std::option::Option<i64>, 998 998 #[serde(borrow)] 999 999 pub root: crate::place_wisp::fs::Directory<'a>, 1000 1000 #[serde(borrow)] ··· 1011 1011 } 1012 1012 /// State trait tracking which required fields have been set 1013 1013 pub trait State: sealed::Sealed { 1014 1014 + type CreatedAt; 1014 1015 type Site; 1015 1016 type Root; 1016 1016 - type CreatedAt; 1017 1017 } 1018 1018 /// Empty state - all required fields are unset 1019 1019 pub struct Empty(()); 1020 1020 impl sealed::Sealed for Empty {} 1021 1021 impl State for Empty { 1022 1022 + type CreatedAt = Unset; 1022 1023 type Site = Unset; 1023 1024 type Root = Unset; 1024 1024 - type CreatedAt = Unset; 1025 1025 + } 1026 1026 + ///State transition - sets the `created_at` field to Set 1027 1027 + pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>); 1028 1028 + impl<S: State> sealed::Sealed for SetCreatedAt<S> {} 1029 1029 + impl<S: State> State for SetCreatedAt<S> { 1030 1030 + type CreatedAt = Set<members::created_at>; 1031 1031 + type Site = S::Site; 1032 1032 + type Root = S::Root; 1025 1033 } 1026 1034 ///State transition - sets the `site` field to Set 1027 1035 pub struct SetSite<S: State = Empty>(PhantomData<fn() -> S>); 1028 1036 impl<S: State> sealed::Sealed for SetSite<S> {} 1029 1037 impl<S: State> State for SetSite<S> { 1038 1038 + type CreatedAt = S::CreatedAt; 1030 1039 type Site = Set<members::site>; 1031 1040 type Root = S::Root; 1032 1032 - type CreatedAt = S::CreatedAt; 1033 1041 } 1034 1042 ///State transition - sets the `root` field to Set 1035 1043 pub struct SetRoot<S: State = Empty>(PhantomData<fn() -> S>); 1036 1044 impl<S: State> sealed::Sealed for SetRoot<S> {} 1037 1045 impl<S: State> State for SetRoot<S> { 1038 1038 - type Site = S::Site; 1039 1039 - type Root = Set<members::root>; 1040 1046 type CreatedAt = S::CreatedAt; 1041 1041 - } 1042 1042 - ///State transition - sets the `created_at` field to Set 1043 1043 - pub struct SetCreatedAt<S: State = Empty>(PhantomData<fn() -> S>); 1044 1044 - impl<S: State> sealed::Sealed for SetCreatedAt<S> {} 1045 1045 - impl<S: State> State for SetCreatedAt<S> { 1046 1047 type Site = S::Site; 1047 1047 - type Root = S::Root; 1048 1048 - type CreatedAt = Set<members::created_at>; 1048 1048 + type Root = Set<members::root>; 1049 1049 } 1050 1050 /// Marker types for field names 1051 1051 #[allow(non_camel_case_types)] 1052 1052 pub mod members { 1053 1053 + ///Marker type for the `created_at` field 1054 1054 + pub struct created_at(()); 1053 1055 ///Marker type for the `site` field 1054 1056 pub struct site(()); 1055 1057 ///Marker type for the `root` field 1056 1058 pub struct root(()); 1057 1057 - ///Marker type for the `created_at` field 1058 1058 - pub struct created_at(()); 1059 1059 } 1060 1060 } 1061 1061 ··· 1162 1162 impl<'a, S> FsBuilder<'a, S> 1163 1163 where 1164 1164 S: fs_state::State, 1165 1165 + S::CreatedAt: fs_state::IsSet, 1165 1166 S::Site: fs_state::IsSet, 1166 1167 S::Root: fs_state::IsSet, 1167 1167 - S::CreatedAt: fs_state::IsSet, 1168 1168 { 1169 1169 /// Build the final struct 1170 1170 pub fn build(self) -> Fs<'a> { ··· 1306 1306 )] 1307 1307 #[serde(rename_all = "camelCase")] 1308 1308 pub struct Subfs<'a> { 1309 1309 - /// If true, the subfs record's root entries are merged (flattened) into the parent directory, replacing the subfs entry. If false (default), the subfs entries are placed in a subdirectory with the subfs entry's name. Flat merging is useful for splitting large directories across multiple records while maintaining a flat structure. 1309 1309 + /// If true (default), the subfs record's root entries are merged (flattened) into the parent directory, replacing the subfs entry. If false, the subfs entries are placed in a subdirectory with the subfs entry's name. Flat merging is useful for splitting large directories across multiple records while maintaining a flat structure. 1310 1310 #[serde(skip_serializing_if = "std::option::Option::is_none")] 1311 1311 - pub flat: Option<bool>, 1311 1311 + pub flat: std::option::Option<bool>, 1312 1312 /// AT-URI pointing to a place.wisp.subfs record containing this subtree. 1313 1313 #[serde(borrow)] 1314 1314 pub subject: jacquard_common::types::string::AtUri<'a>,

cli/src/place_wisp/settings.rs cli/crates/lexicons/src/place_wisp/settings.rs

+30 -30

cli/src/place_wisp/subfs.rs cli/crates/lexicons/src/place_wisp/subfs.rs

··· 725 725 pub struct File<'a> { 726 726 /// True if blob content is base64-encoded (used to bypass PDS content sniffing) 727 727 #[serde(skip_serializing_if = "std::option::Option::is_none")] 728 728 - pub base64: Option<bool>, 728 728 + pub base64: std::option::Option<bool>, 729 729 /// Content blob ref 730 730 #[serde(borrow)] 731 731 pub blob: jacquard_common::types::blob::BlobRef<'a>, 732 732 /// Content encoding (e.g., gzip for compressed files) 733 733 #[serde(skip_serializing_if = "std::option::Option::is_none")] 734 734 #[serde(borrow)] 735 735 - pub encoding: Option<jacquard_common::CowStr<'a>>, 735 735 + pub encoding: std::option::Option<jacquard_common::CowStr<'a>>, 736 736 /// Original MIME type before compression 737 737 #[serde(skip_serializing_if = "std::option::Option::is_none")] 738 738 #[serde(borrow)] 739 739 - pub mime_type: Option<jacquard_common::CowStr<'a>>, 739 739 + pub mime_type: std::option::Option<jacquard_common::CowStr<'a>>, 740 740 #[serde(borrow)] 741 741 pub r#type: jacquard_common::CowStr<'a>, 742 742 } ··· 751 751 } 752 752 /// State trait tracking which required fields have been set 753 753 pub trait State: sealed::Sealed { 754 754 - type Type; 755 754 type Blob; 755 755 + type Type; 756 756 } 757 757 /// Empty state - all required fields are unset 758 758 pub struct Empty(()); 759 759 impl sealed::Sealed for Empty {} 760 760 impl State for Empty { 761 761 - type Type = Unset; 762 761 type Blob = Unset; 763 763 - } 764 764 - ///State transition - sets the `type` field to Set 765 765 - pub struct SetType<S: State = Empty>(PhantomData<fn() -> S>); 766 766 - impl<S: State> sealed::Sealed for SetType<S> {} 767 767 - impl<S: State> State for SetType<S> { 768 768 - type Type = Set<members::r#type>; 769 769 - type Blob = S::Blob; 762 762 + type Type = Unset; 770 763 } 771 764 ///State transition - sets the `blob` field to Set 772 765 pub struct SetBlob<S: State = Empty>(PhantomData<fn() -> S>); 773 766 impl<S: State> sealed::Sealed for SetBlob<S> {} 774 767 impl<S: State> State for SetBlob<S> { 768 768 + type Blob = Set<members::blob>; 775 769 type Type = S::Type; 776 776 - type Blob = Set<members::blob>; 770 770 + } 771 771 + ///State transition - sets the `type` field to Set 772 772 + pub struct SetType<S: State = Empty>(PhantomData<fn() -> S>); 773 773 + impl<S: State> sealed::Sealed for SetType<S> {} 774 774 + impl<S: State> State for SetType<S> { 775 775 + type Blob = S::Blob; 776 776 + type Type = Set<members::r#type>; 777 777 } 778 778 /// Marker types for field names 779 779 #[allow(non_camel_case_types)] 780 780 pub mod members { 781 781 + ///Marker type for the `blob` field 782 782 + pub struct blob(()); 781 783 ///Marker type for the `type` field 782 784 pub struct r#type(()); 783 783 - ///Marker type for the `blob` field 784 784 - pub struct blob(()); 785 785 } 786 786 } 787 787 ··· 905 905 impl<'a, S> FileBuilder<'a, S> 906 906 where 907 907 S: file_state::State, 908 908 - S::Type: file_state::IsSet, 909 908 S::Blob: file_state::IsSet, 909 909 + S::Type: file_state::IsSet, 910 910 { 911 911 /// Build the final struct 912 912 pub fn build(self) -> File<'a> { ··· 970 970 pub struct SubfsRecord<'a> { 971 971 pub created_at: jacquard_common::types::string::Datetime, 972 972 #[serde(skip_serializing_if = "std::option::Option::is_none")] 973 973 - pub file_count: Option<i64>, 973 973 + pub file_count: std::option::Option<i64>, 974 974 #[serde(borrow)] 975 975 pub root: crate::place_wisp::subfs::Directory<'a>, 976 976 } ··· 1260 1260 } 1261 1261 /// State trait tracking which required fields have been set 1262 1262 pub trait State: sealed::Sealed { 1263 1263 - type Type; 1264 1263 type Subject; 1264 1264 + type Type; 1265 1265 } 1266 1266 /// Empty state - all required fields are unset 1267 1267 pub struct Empty(()); 1268 1268 impl sealed::Sealed for Empty {} 1269 1269 impl State for Empty { 1270 1270 - type Type = Unset; 1271 1270 type Subject = Unset; 1272 1272 - } 1273 1273 - ///State transition - sets the `type` field to Set 1274 1274 - pub struct SetType<S: State = Empty>(PhantomData<fn() -> S>); 1275 1275 - impl<S: State> sealed::Sealed for SetType<S> {} 1276 1276 - impl<S: State> State for SetType<S> { 1277 1277 - type Type = Set<members::r#type>; 1278 1278 - type Subject = S::Subject; 1271 1271 + type Type = Unset; 1279 1272 } 1280 1273 ///State transition - sets the `subject` field to Set 1281 1274 pub struct SetSubject<S: State = Empty>(PhantomData<fn() -> S>); 1282 1275 impl<S: State> sealed::Sealed for SetSubject<S> {} 1283 1276 impl<S: State> State for SetSubject<S> { 1284 1284 - type Type = S::Type; 1285 1277 type Subject = Set<members::subject>; 1278 1278 + type Type = S::Type; 1279 1279 + } 1280 1280 + ///State transition - sets the `type` field to Set 1281 1281 + pub struct SetType<S: State = Empty>(PhantomData<fn() -> S>); 1282 1282 + impl<S: State> sealed::Sealed for SetType<S> {} 1283 1283 + impl<S: State> State for SetType<S> { 1284 1284 + type Subject = S::Subject; 1285 1285 + type Type = Set<members::r#type>; 1286 1286 } 1287 1287 /// Marker types for field names 1288 1288 #[allow(non_camel_case_types)] 1289 1289 pub mod members { 1290 1290 - ///Marker type for the `type` field 1291 1291 - pub struct r#type(()); 1292 1290 ///Marker type for the `subject` field 1293 1291 pub struct subject(()); 1292 1292 + ///Marker type for the `type` field 1293 1293 + pub struct r#type(()); 1294 1294 } 1295 1295 } 1296 1296 ··· 1363 1363 impl<'a, S> SubfsBuilder<'a, S> 1364 1364 where 1365 1365 S: subfs_state::State, 1366 1366 - S::Type: subfs_state::IsSet, 1367 1366 S::Subject: subfs_state::IsSet, 1367 1367 + S::Type: subfs_state::IsSet, 1368 1368 { 1369 1369 /// Build the final struct 1370 1370 pub fn build(self) -> Subfs<'a> {

+12 -12

cli/src/pull.rs

··· 1 1 use crate::blob_map; 2 2 use crate::download; 3 3 use crate::metadata::SiteMetadata; 4 4 - use crate::place_wisp::fs::*; 4 4 + use wisp_lexicons::place_wisp::fs::*; 5 5 use crate::subfs_utils; 6 6 use jacquard::CowStr; 7 7 use jacquard::prelude::IdentityResolver; ··· 410 410 ) -> miette::Result<Directory<'static>> { 411 411 use jacquard_common::IntoStatic; 412 412 use jacquard_common::types::value::from_data; 413 413 - use crate::place_wisp::subfs::SubfsRecord; 413 413 + use wisp_lexicons::place_wisp::subfs::SubfsRecord; 414 414 415 415 - let mut all_subfs_map: HashMap<String, crate::place_wisp::subfs::Directory> = HashMap::new(); 415 415 + let mut all_subfs_map: HashMap<String, wisp_lexicons::place_wisp::subfs::Directory> = HashMap::new(); 416 416 let mut to_fetch = subfs_utils::extract_subfs_uris(directory, String::new()); 417 417 418 418 if to_fetch.is_empty() { ··· 516 516 517 517 /// Extract subfs URIs from a subfs::Directory (helper for pull) 518 518 fn extract_subfs_uris_from_subfs_dir( 519 519 - directory: &crate::place_wisp::subfs::Directory, 519 519 + directory: &wisp_lexicons::place_wisp::subfs::Directory, 520 520 current_path: String, 521 521 ) -> Vec<(String, String)> { 522 522 let mut uris = Vec::new(); ··· 529 529 }; 530 530 531 531 match &entry.node { 532 532 - crate::place_wisp::subfs::EntryNode::Subfs(subfs_node) => { 532 532 + wisp_lexicons::place_wisp::subfs::EntryNode::Subfs(subfs_node) => { 533 533 uris.push((subfs_node.subject.to_string(), full_path.clone())); 534 534 } 535 535 - crate::place_wisp::subfs::EntryNode::Directory(subdir) => { 535 535 + wisp_lexicons::place_wisp::subfs::EntryNode::Directory(subdir) => { 536 536 let nested = extract_subfs_uris_from_subfs_dir(subdir, full_path); 537 537 uris.extend(nested); 538 538 } ··· 546 546 /// Recursively replace subfs nodes with their actual content 547 547 fn replace_subfs_with_content( 548 548 directory: Directory, 549 549 - subfs_map: &HashMap<String, crate::place_wisp::subfs::Directory>, 549 549 + subfs_map: &HashMap<String, wisp_lexicons::place_wisp::subfs::Directory>, 550 550 current_path: String, 551 551 ) -> Directory<'static> { 552 552 use jacquard_common::IntoStatic; ··· 628 628 } 629 629 630 630 /// Convert a subfs entry to a fs entry (they have the same structure but different types) 631 631 - fn convert_subfs_entry_to_fs(subfs_entry: crate::place_wisp::subfs::Entry<'static>) -> Entry<'static> { 631 631 + fn convert_subfs_entry_to_fs(subfs_entry: wisp_lexicons::place_wisp::subfs::Entry<'static>) -> Entry<'static> { 632 632 use jacquard_common::IntoStatic; 633 633 634 634 let node = match subfs_entry.node { 635 635 - crate::place_wisp::subfs::EntryNode::File(file) => { 635 635 + wisp_lexicons::place_wisp::subfs::EntryNode::File(file) => { 636 636 EntryNode::File(Box::new( 637 637 File::new() 638 638 .r#type(file.r#type.into_static()) ··· 643 643 .build() 644 644 )) 645 645 } 646 646 - crate::place_wisp::subfs::EntryNode::Directory(dir) => { 646 646 + wisp_lexicons::place_wisp::subfs::EntryNode::Directory(dir) => { 647 647 let converted_entries: Vec<Entry<'static>> = dir 648 648 .entries 649 649 .into_iter() ··· 657 657 .build() 658 658 )) 659 659 } 660 660 - crate::place_wisp::subfs::EntryNode::Subfs(_nested_subfs) => { 660 660 + wisp_lexicons::place_wisp::subfs::EntryNode::Subfs(_nested_subfs) => { 661 661 // Nested subfs should have been expanded already - if we get here, it means expansion failed 662 662 // Treat it like a directory reference that should have been expanded 663 663 eprintln!(" ⚠️ Warning: unexpanded nested subfs at path, treating as empty directory"); ··· 668 668 .build() 669 669 )) 670 670 } 671 671 - crate::place_wisp::subfs::EntryNode::Unknown(unknown) => { 671 671 + wisp_lexicons::place_wisp::subfs::EntryNode::Unknown(unknown) => { 672 672 EntryNode::Unknown(unknown) 673 673 } 674 674 };

+1 -1

cli/src/serve.rs

··· 1 1 use crate::pull::pull_site; 2 2 use crate::redirects::{load_redirect_rules, match_redirect_rule, RedirectRule}; 3 3 - use crate::place_wisp::settings::Settings; 3 3 + use wisp_lexicons::place_wisp::settings::Settings; 4 4 use axum::{ 5 5 Router, 6 6 extract::Request,

+14 -14

cli/src/subfs_utils.rs

··· 6 6 use miette::IntoDiagnostic; 7 7 use std::collections::HashMap; 8 8 9 9 - use crate::place_wisp::fs::{Directory as FsDirectory, EntryNode as FsEntryNode}; 10 10 - use crate::place_wisp::subfs::SubfsRecord; 9 9 + use wisp_lexicons::place_wisp::fs::{Directory as FsDirectory, EntryNode as FsEntryNode}; 10 10 + use wisp_lexicons::place_wisp::subfs::SubfsRecord; 11 11 12 12 /// Extract all subfs URIs from a directory tree with their mount paths 13 13 pub fn extract_subfs_uris(directory: &FsDirectory, current_path: String) -> Vec<(String, String)> { ··· 145 145 146 146 /// Extract subfs URIs from a subfs::Directory 147 147 fn extract_subfs_uris_from_subfs_dir( 148 148 - directory: &crate::place_wisp::subfs::Directory, 148 148 + directory: &wisp_lexicons::place_wisp::subfs::Directory, 149 149 current_path: String, 150 150 ) -> Vec<(String, String)> { 151 151 let mut uris = Vec::new(); 152 152 153 153 for entry in &directory.entries { 154 154 match &entry.node { 155 155 - crate::place_wisp::subfs::EntryNode::Subfs(subfs_node) => { 155 155 + wisp_lexicons::place_wisp::subfs::EntryNode::Subfs(subfs_node) => { 156 156 // Check if this is a chunk entry (chunk0, chunk1, etc.) 157 157 // Chunks should be flat-merged, so use the parent's path 158 158 let mount_path = if entry.name.starts_with("chunk") && ··· 171 171 172 172 uris.push((subfs_node.subject.to_string(), mount_path)); 173 173 } 174 174 - crate::place_wisp::subfs::EntryNode::Directory(subdir) => { 174 174 + wisp_lexicons::place_wisp::subfs::EntryNode::Directory(subdir) => { 175 175 let full_path = if current_path.is_empty() { 176 176 entry.name.to_string() 177 177 } else { ··· 204 204 for (mount_path, subfs_record) in all_subfs { 205 205 // Check if this record only contains chunk subfs references (no files) 206 206 let only_has_chunks = subfs_record.root.entries.iter().all(|e| { 207 207 - matches!(&e.node, crate::place_wisp::subfs::EntryNode::Subfs(_)) && 207 207 + matches!(&e.node, wisp_lexicons::place_wisp::subfs::EntryNode::Subfs(_)) && 208 208 e.name.starts_with("chunk") && 209 209 e.name.chars().skip(5).all(|c| c.is_ascii_digit()) 210 210 }); ··· 232 232 /// Extract blobs from a subfs directory (works with subfs::Directory) 233 233 /// Returns a map of file paths to their blob refs and CIDs 234 234 fn extract_subfs_blobs( 235 235 - directory: &crate::place_wisp::subfs::Directory, 235 235 + directory: &wisp_lexicons::place_wisp::subfs::Directory, 236 236 current_path: String, 237 237 ) -> HashMap<String, (BlobRef<'static>, String)> { 238 238 let mut blob_map = HashMap::new(); ··· 245 245 }; 246 246 247 247 match &entry.node { 248 248 - crate::place_wisp::subfs::EntryNode::File(file_node) => { 248 248 + wisp_lexicons::place_wisp::subfs::EntryNode::File(file_node) => { 249 249 let blob_ref = &file_node.blob; 250 250 let cid_string = blob_ref.blob().r#ref.to_string(); 251 251 blob_map.insert( ··· 253 253 (blob_ref.clone().into_static(), cid_string) 254 254 ); 255 255 } 256 256 - crate::place_wisp::subfs::EntryNode::Directory(subdir) => { 256 256 + wisp_lexicons::place_wisp::subfs::EntryNode::Directory(subdir) => { 257 257 let sub_map = extract_subfs_blobs(subdir, full_path); 258 258 blob_map.extend(sub_map); 259 259 } 260 260 - crate::place_wisp::subfs::EntryNode::Subfs(_nested_subfs) => { 260 260 + wisp_lexicons::place_wisp::subfs::EntryNode::Subfs(_nested_subfs) => { 261 261 // Nested subfs - these should be resolved recursively in the main flow 262 262 // For now, we skip them (they'll be fetched separately) 263 263 eprintln!(" ⚠️ Found nested subfs at {}, skipping (should be fetched separately)", full_path); 264 264 } 265 265 - crate::place_wisp::subfs::EntryNode::Unknown(_) => { 265 265 + wisp_lexicons::place_wisp::subfs::EntryNode::Unknown(_) => { 266 266 // Skip unknown nodes 267 267 } 268 268 } ··· 352 352 flat: bool, 353 353 ) -> miette::Result<FsDirectory<'static>> { 354 354 use jacquard_common::CowStr; 355 355 - use crate::place_wisp::fs::{Entry, Subfs}; 355 355 + use wisp_lexicons::place_wisp::fs::{Entry, Subfs}; 356 356 357 357 let path_parts: Vec<&str> = target_path.split('/').collect(); 358 358 ··· 430 430 431 431 // Construct AT-URI and convert to RecordUri 432 432 let at_uri = AtUri::new(uri).into_diagnostic()?; 433 433 - let record_uri: RecordUri<'_, crate::place_wisp::subfs::SubfsRecordRecord> = RecordUri::try_from_uri(at_uri).into_diagnostic()?; 433 433 + let record_uri: RecordUri<'_, wisp_lexicons::place_wisp::subfs::SubfsRecordRecord> = RecordUri::try_from_uri(at_uri).into_diagnostic()?; 434 434 435 435 let rkey = record_uri.rkey() 436 436 .ok_or_else(|| miette::miette!("Invalid subfs URI: missing rkey"))? ··· 489 489 } 490 490 491 491 /// Estimate the JSON size of a single entry 492 492 - fn estimate_entry_size(entry: &crate::place_wisp::fs::Entry) -> usize { 492 492 + fn estimate_entry_size(entry: &wisp_lexicons::place_wisp::fs::Entry) -> usize { 493 493 match serde_json::to_string(entry) { 494 494 Ok(json) => json.len(), 495 495 Err(_) => 500, // Conservative estimate if serialization fails

+2 -1

package.json

··· 24 24 "check": "cd apps/main-app && npm run check && cd ../hosting-service && npm run check", 25 25 "screenshot": "bun run apps/main-app/scripts/screenshot-sites.ts", 26 26 "hosting:dev": "cd apps/hosting-service && npm run dev", 27 27 - "hosting:start": "cd apps/hosting-service && npm run start" 27 27 + "hosting:start": "cd apps/hosting-service && npm run start", 28 28 + "codegen": "./scripts/codegen.sh" 28 29 }, 29 30 "trustedDependencies": [ 30 31 "@parcel/watcher",

packages/@wisp/lexicons/lexicons/fs.json lexicons/fs.json

packages/@wisp/lexicons/lexicons/settings.json lexicons/settings.json

packages/@wisp/lexicons/lexicons/subfs.json lexicons/subfs.json

+1 -1

packages/@wisp/lexicons/package.json

··· 32 32 } 33 33 }, 34 34 "scripts": { 35 35 - "codegen": "lex gen-server ./src ./lexicons" 35 35 + "codegen": "lex gen-server ./src ../../../lexicons/*.json" 36 36 }, 37 37 "dependencies": { 38 38 "@atproto/lexicon": "^0.5.1",

+1 -1

packages/@wisp/lexicons/src/index.ts

··· 9 9 type MethodConfigOrHandler, 10 10 createServer as createXrpcServer, 11 11 } from '@atproto/xrpc-server' 12 12 - import { schemas } from './lexicons' 12 12 + import { schemas } from './lexicons.js' 13 13 14 14 export function createServer(options?: XrpcOptions): Server { 15 15 return new Server(options)

+1 -1

packages/@wisp/lexicons/src/lexicons.ts

··· 7 7 ValidationError, 8 8 type ValidationResult, 9 9 } from '@atproto/lexicon' 10 10 - import { type $Typed, is$typed, maybe$typed } from './util' 10 10 + import { type $Typed, is$typed, maybe$typed } from './util.js' 11 11 12 12 export const schemaDict = { 13 13 PlaceWispFs: {

+28

scripts/codegen.sh

··· 1 1 + #!/bin/bash 2 2 + set -e 3 3 + 4 4 + SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" 5 5 + ROOT_DIR="$(dirname "$SCRIPT_DIR")" 6 6 + 7 7 + # Parse arguments 8 8 + AUTO_ACCEPT="" 9 9 + if [[ "$1" == "-y" || "$1" == "--yes" ]]; then 10 10 + AUTO_ACCEPT="yes |" 11 11 + fi 12 12 + 13 13 + echo "=== Generating TypeScript lexicons ===" 14 14 + cd "$ROOT_DIR/packages/@wisp/lexicons" 15 15 + eval "$AUTO_ACCEPT npm run codegen" 16 16 + 17 17 + echo "=== Generating Rust lexicons ===" 18 18 + echo "Installing jacquard-lexgen..." 19 19 + cargo install jacquard-lexgen --version 0.9.5 2>/dev/null || true 20 20 + echo "Running jacquard-codegen..." 21 21 + echo " Input: $ROOT_DIR/lexicons" 22 22 + echo " Output: $ROOT_DIR/cli/crates/lexicons/src" 23 23 + jacquard-codegen -i "$ROOT_DIR/lexicons" -o "$ROOT_DIR/cli/crates/lexicons/src" 24 24 + 25 25 + # Add extern crate alloc for the macro to work 26 26 + sed -i '' '1s/^/extern crate alloc;\n\n/' "$ROOT_DIR/cli/crates/lexicons/src/lib.rs" 27 27 + 28 28 + echo "=== Done ==="