From 522b28a309c4f2c3008ec4f114f2047a56658fdf Mon Sep 17 00:00:00 2001 From: aiongg Date: Sat, 14 Nov 2026 03:16:54 +0000 Subject: [PATCH 01/15] Lints: the clipboard conversion helper is re-exported for tests only --- crates/platform/src/clipboard.rs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/crates/platform/src/clipboard.rs b/crates/platform/src/clipboard.rs index b5c01ad0f..bf5cce9e0 100644 --- a/crates/platform/src/clipboard.rs +++ b/crates/platform/src/clipboard.rs @@ -21,12 +21,14 @@ mod probe; mod types; pub use backend::*; -pub(crate) use convert::*; pub use event::*; pub use facade::*; pub use probe::*; pub use types::*; +#[cfg(test)] +pub(crate) use convert::rgba8_image; + // The probe's backend lives on its worker. const _: () = { const fn sendable() {} From 848e44779e9620dc6ab8ccc8e963d289e594bc8f Mon Sep 17 00:00:00 2001 From: aiongg Date: Sat, 14 Nov 2026 03:49:57 +0000 Subject: [PATCH 02/15] Facade: features for the format crates from the last main merge --- crates/craft/Cargo.toml | 309 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 309 insertions(+) diff --git a/crates/craft/Cargo.toml b/crates/craft/Cargo.toml index 3c9c844d3..4b0dd0a0c 100644 --- a/crates/craft/Cargo.toml +++ b/crates/craft/Cargo.toml @@ -106,18 +106,39 @@ screen-testing = [ "craft-timeline?/screen-testing", "craft-update?/screen-testing", ] +aaf = ["dep:craft-aaf"] + +aep = ["dep:craft-aep"] + +affinity = ["dep:craft-affinity"] +affinity-synth = ["affinity", "craft-affinity/synth"] + ai-core = ["dep:craft-ai-core"] +assuan = ["dep:craft-assuan"] + atomic = ["dep:craft-atomic"] audio = ["dep:craft-audio"] +audio-aac-decode = ["audio", "craft-audio/aac-decode"] +audio-aac-encode = ["audio", "craft-audio/aac-encode"] +audio-ac3-decode = ["audio", "craft-audio/ac3-decode"] +audio-ac3-encode = ["audio", "craft-audio/ac3-encode"] +audio-alac-decode = ["audio", "craft-audio/alac-decode"] +audio-alac-encode = ["audio", "craft-audio/alac-encode"] audio-decode = ["audio", "craft-audio/decode"] audio-decode-native = ["audio", "craft-audio/decode-native"] +audio-eac3-encode = ["audio", "craft-audio/eac3-encode"] audio-encode = ["audio", "craft-audio/encode"] audio-flac-encode = ["audio", "craft-audio/flac-encode"] audio-lossless-encode = ["audio", "craft-audio/lossless-encode"] +audio-mp3-decode = ["audio", "craft-audio/mp3-decode"] +audio-mp3-encode = ["audio", "craft-audio/mp3-encode"] +audio-mpa-decode = ["audio", "craft-audio/mpa-decode"] +audio-opus-decode = ["audio", "craft-audio/opus-decode"] audio-pcm-encode = ["audio", "craft-audio/pcm-encode"] audio-peaks = ["audio", "craft-audio/peaks"] +audio-rayon = ["audio", "craft-audio/rayon"] audio-serde = ["audio", "craft-audio/serde"] audio-symphonia = ["audio", "craft-audio/symphonia"] @@ -125,23 +146,75 @@ automation = ["dep:craft-automation", "keymap"] browse = ["dep:craft-browse"] +captions = ["dep:craft-captions"] + +cfb = ["dep:craft-cfb"] + cms = ["dep:craft-cms"] +codepage = ["dep:craft-codepage"] + color = ["dep:craft-color", "keymap", "settings", "window", "platform"] +crs = ["dep:craft-crs"] + crw = ["dep:craft-crw"] +csv = ["dep:craft-csv"] + +dav = ["dep:craft-dav"] + +designcraft-format = ["dep:craft-designcraft-format"] + dialogs = ["dep:craft-dialogs"] # native only: rfd's folder picker and file paths doc = ["dep:craft-doc"] doc-pcraft-pixels = ["doc", "craft-doc/pcraft-pixels"] +doc-binary = ["dep:craft-doc-binary"] + docpath = ["dep:craft-docpath"] +document-bundle = ["dep:craft-document-bundle"] + +docx = ["dep:craft-docx"] + +dpx = ["dep:craft-dpx"] + draw = ["dep:craft-draw", "keymap", "color", "settings"] +drawingml = ["dep:craft-drawingml"] + +dwg = ["dep:craft-dwg"] + +dxf = ["dep:craft-dxf"] + ecproj-format = ["dep:craft-ecproj-format"] +eps = ["dep:craft-eps"] +eps-paths = ["eps", "craft-eps/paths"] + +epub = ["dep:craft-epub"] + +ews = ["dep:craft-ews"] + +exr = ["dep:craft-exr"] +exr-decode = ["exr", "craft-exr/decode"] + +fig = ["dep:craft-fig"] + +figcraft-format = ["dep:craft-figcraft-format"] + +figma-rest = ["dep:craft-figma-rest"] + +file-formats = ["dep:craft-file-formats"] + +file-import = ["dep:craft-file-import"] + +flags = ["dep:craft-flags"] + +flow = ["dep:craft-flow"] + font-catalog = ["dep:craft-font-catalog"] font-catalog-system = ["font-catalog", "craft-font-catalog/system"] @@ -152,46 +225,141 @@ font-store-bundled-index = ["font-store", "craft-font-store/bundled-index"] font-subset = ["dep:craft-font-subset"] # native only: HarfBuzz's C++ builds with the target's C++ compiler +gainmap = ["dep:craft-gainmap"] + +gcode = ["dep:craft-gcode"] + +gif = ["dep:craft-gif"] +gif-frames = ["gif", "craft-gif/frames"] + +hdr = ["dep:craft-hdr"] + +heif = ["dep:craft-heif"] +heif-decode = ["heif", "craft-heif/decode"] +heif-metadata = ["heif", "craft-heif/metadata"] +heif-testdata = ["heif", "craft-heif/testdata"] + +html = ["dep:craft-html"] +html-flow = ["html", "craft-html/flow"] + i18n-collate = ["craft-i18n/collate"] +ical = ["dep:craft-ical"] + +idml = ["dep:craft-idml"] + imaging = ["dep:craft-imaging", "keymap"] +indd = ["dep:craft-indd"] + +jmap = ["dep:craft-jmap"] + jpeg = ["dep:craft-jpeg"] keymap = ["dep:craft-keymap"] keymap-egui = ["keymap", "craft-keymap/egui"] +kiwi = ["dep:craft-kiwi"] + +kra = ["dep:craft-kra"] + +latex = ["dep:craft-latex"] + layers = ["dep:craft-layers"] +lottie = ["dep:craft-lottie"] + +markdown = ["dep:craft-markdown"] + +materialx = ["dep:craft-materialx"] + +math = ["dep:craft-math"] + media = ["dep:craft-media"] +media-avi = ["media", "craft-media/avi"] media-bitstream = ["media", "craft-media/bitstream"] media-isobmff = ["media", "craft-media/isobmff"] media-matroska = ["media", "craft-media/matroska"] +media-mpegts = ["media", "craft-media/mpegts"] +media-mxf = ["media", "craft-media/mxf"] media-ogg = ["media", "craft-media/ogg"] media-serde = ["media", "craft-media/serde"] menu = ["dep:craft-menu"] +mesh = ["dep:craft-mesh"] +mesh-fbx = ["mesh", "craft-mesh/fbx"] +mesh-gltf = ["mesh", "craft-mesh/gltf"] +mesh-obj = ["mesh", "craft-mesh/obj"] +mesh-ply = ["mesh", "craft-mesh/ply"] +mesh-stl = ["mesh", "craft-mesh/stl"] +mesh-threemf = ["mesh", "craft-mesh/threemf"] + +metadata = ["dep:craft-metadata"] + +metafile = ["dep:craft-metafile"] +metafile-write = ["metafile", "craft-metafile/write"] + +midi = ["dep:craft-midi"] +midi-serde = ["midi", "craft-midi/serde"] + +mime = ["dep:craft-mime"] +mime-detect = ["mime", "craft-mime/detect"] + +odf = ["dep:craft-odf"] +odf-text = ["odf", "craft-odf/text"] + +ods = ["dep:craft-ods"] + +offcrypto = ["dep:craft-offcrypto"] + +opc = ["dep:craft-opc"] +opc-test-support = ["opc", "craft-opc/test-support"] + +openpgp = ["dep:craft-openpgp"] + +ora = ["dep:craft-ora"] + pages = ["dep:craft-pages"] +pcraft-bundle = ["dep:craft-pcraft-bundle"] + pcraft-format = ["dep:craft-pcraft-format"] pdf = ["dep:craft-pdf"] +pdf-cos = ["pdf", "craft-pdf/cos"] +pdf-crypt = ["pdf", "craft-pdf/crypt"] +pdf-filters = ["pdf", "craft-pdf/filters"] pdf-interpret = ["pdf", "craft-pdf/interpret"] +pdf-paths = ["pdf", "craft-pdf/paths"] pdf-raster = ["pdf", "craft-pdf/raster"] pdf-read = ["pdf", "craft-pdf/read"] pdf-write = ["pdf", "craft-pdf/write"] pdf-write-pdf = ["pdf", "craft-pdf/write-pdf"] pdf-write-simple-text = ["pdf", "craft-pdf/write-simple-text"] +pdn = ["dep:craft-pdn"] + +penpot = ["dep:craft-penpot"] + +pkcs7 = ["dep:craft-pkcs7"] + platform = ["dep:craft-platform"] platform-appearance = ["platform", "craft-platform/appearance"] platform-browser = ["platform", "craft-platform/browser"] platform-clipboard = ["platform", "craft-platform/clipboard"] platform-pointer = ["platform", "craft-platform/pointer"] platform-screen = ["platform", "craft-platform/screen"] +platform-testing = ["platform", "craft-platform/testing"] platform-usage = ["platform", "craft-platform/usage"] +plotter = ["dep:craft-plotter"] +plotter-serde = ["plotter", "craft-plotter/serde"] + +pptx = ["dep:craft-pptx"] + +prc = ["dep:craft-prc"] + prepress = ["dep:craft-prepress"] prepress-flatten = ["prepress", "craft-prepress/flatten"] @@ -199,12 +367,69 @@ print = ["dep:craft-print"] proof = ["dep:craft-proof"] +psd = ["dep:craft-psd"] +psd-corpus = ["psd", "craft-psd/corpus"] +psd-serde = ["psd", "craft-psd/serde"] +psd-testgen = ["psd", "craft-psd/testgen"] + +pst = ["dep:craft-pst"] +pst-test-writer = ["pst", "craft-pst/test-writer"] + quit = ["dep:craft-quit"] +raster-codecs = ["dep:craft-raster-codecs"] + +raw = ["dep:craft-raw"] +raw-arw = ["raw", "craft-raw/arw"] +raw-cr2 = ["raw", "craft-raw/cr2"] +raw-cr3 = ["raw", "craft-raw/cr3"] +raw-crw = ["raw", "craft-raw/crw"] +raw-dng = ["raw", "craft-raw/dng"] +raw-erf = ["raw", "craft-raw/erf"] +raw-hasselblad = ["raw", "craft-raw/hasselblad"] +raw-jxl = ["raw", "craft-raw/jxl"] +raw-kodak = ["raw", "craft-raw/kodak"] +raw-mef = ["raw", "craft-raw/mef"] +raw-mrw = ["raw", "craft-raw/mrw"] +raw-nef = ["raw", "craft-raw/nef"] +raw-orf = ["raw", "craft-raw/orf"] +raw-pef = ["raw", "craft-raw/pef"] +raw-raf = ["raw", "craft-raw/raf"] +raw-rw2 = ["raw", "craft-raw/rw2"] +raw-srw = ["raw", "craft-raw/srw"] + review = ["dep:craft-review", "keymap"] +rtf = ["dep:craft-rtf"] +rtf-doc = ["rtf", "craft-rtf/doc"] +rtf-outlook = ["rtf", "craft-rtf/outlook"] + +scraft-format = ["dep:craft-scraft-format"] + settings = ["dep:craft-settings"] +sf2 = ["dep:craft-sf2"] +sf2-test-support = ["sf2", "craft-sf2/test-support"] + +sheet = ["dep:craft-sheet"] + +silhouette-studio = ["dep:craft-silhouette-studio"] + +sketch = ["dep:craft-sketch"] + +stencilcraft-document = ["dep:craft-stencilcraft-document"] + +stencilcraft-format = ["dep:craft-stencilcraft-format"] + +stream-codecs = ["dep:craft-stream-codecs"] + +svg = ["dep:craft-svg"] +svg-tree = ["svg", "craft-svg/tree"] +svg-tree-system-fonts = ["svg", "craft-svg/tree-system-fonts"] +svg-tree-text = ["svg", "craft-svg/tree-text"] + +svg-paths = ["dep:craft-svg-paths"] + table = ["dep:craft-table", "keymap"] text = ["dep:craft-text"] @@ -269,9 +494,17 @@ text-turkish = ["text", "craft-text/turkish"] text-turkmen = ["text", "craft-text/turkmen"] text-ukrainian = ["text", "craft-text/ukrainian"] +tga = ["dep:craft-tga"] + theme-store = ["dep:craft-theme-store"] +tiff = ["dep:craft-tiff"] + +time = ["dep:craft-time"] + timeline = ["dep:craft-timeline", "keymap"] +timeline-otio = ["timeline", "craft-timeline/otio"] +timeline-xml = ["timeline", "craft-timeline/xml"] ui-app = ["ui", "craft-ui/app"] ui-color_fonts = ["ui", "craft-ui/color_fonts"] @@ -279,13 +512,89 @@ ui-snapshot = ["ui", "craft-ui/snapshot"] ui-system_fonts = ["ui", "craft-ui/system_fonts"] ui-testing = ["ui", "craft-ui/testing"] +ui-canvas = ["dep:craft-ui-canvas"] +ui-canvas-testing = ["ui-canvas", "craft-ui-canvas/testing"] + +ui-contract = ["dep:craft-ui-contract"] +ui-contract-color_fonts = ["ui-contract", "craft-ui-contract/color_fonts"] +ui-contract-snapshot = ["ui-contract", "craft-ui-contract/snapshot"] +ui-contract-system_fonts = ["ui-contract", "craft-ui-contract/system_fonts"] +ui-contract-testing = ["ui-contract", "craft-ui-contract/testing"] + +ui-panels = ["dep:craft-ui-panels"] +ui-panels-testing = ["ui-panels", "craft-ui-panels/testing"] + +ui-patterns = ["dep:craft-ui-patterns"] +ui-patterns-testing = ["ui-patterns", "craft-ui-patterns/testing"] + +ui-shell = ["dep:craft-ui-shell"] +ui-shell-app = ["ui-shell", "craft-ui-shell/app"] +ui-shell-testing = ["ui-shell", "craft-ui-shell/testing"] + +ui-test-kit = ["dep:craft-ui-test-kit"] + +ui-widgets = ["dep:craft-ui-widgets"] +ui-widgets-testing = ["ui-widgets", "craft-ui-widgets/testing"] + update = ["dep:craft-update"] # native only: downloads and installs through getrandom without wasm support +vcard = ["dep:craft-vcard"] + vectorcraft-format = ["dep:craft-vectorcraft-format"] +vectordrawable = ["dep:craft-vectordrawable"] + +video = ["dep:craft-video"] +video-apv = ["video", "craft-video/apv"] +video-apv-decode = ["video", "craft-video/apv-decode"] +video-apv-encode = ["video", "craft-video/apv-encode"] +video-av1 = ["video", "craft-video/av1"] +video-av1-decode = ["video", "craft-video/av1-decode"] +video-av1-encode = ["video", "craft-video/av1-encode"] +video-dnx = ["video", "craft-video/dnx"] +video-h264 = ["video", "craft-video/h264"] +video-h264-decode = ["video", "craft-video/h264-decode"] +video-h264-encode = ["video", "craft-video/h264-encode"] +video-hevc = ["video", "craft-video/hevc"] +video-hevc-decode = ["video", "craft-video/hevc-decode"] +video-hevc-encode = ["video", "craft-video/hevc-encode"] +video-mpeg2 = ["video", "craft-video/mpeg2"] +video-mpeg2-decode = ["video", "craft-video/mpeg2-decode"] +video-mpeg2-encode = ["video", "craft-video/mpeg2-encode"] +video-mpeg4 = ["video", "craft-video/mpeg4"] +video-mpeg4-encode = ["video", "craft-video/mpeg4-encode"] +video-prores = ["video", "craft-video/prores"] +video-threads = ["video", "craft-video/threads"] +video-vp8 = ["video", "craft-video/vp8"] +video-vp8-decode = ["video", "craft-video/vp8-decode"] +video-vp8-encode = ["video", "craft-video/vp8-encode"] +video-vp9 = ["video", "craft-video/vp9"] +video-vp9-decode = ["video", "craft-video/vp9-decode"] +video-vp9-encode = ["video", "craft-video/vp9-encode"] + web-api = ["dep:craft-web-api"] web-host = ["dep:craft-web-host"] +webp = ["dep:craft-webp"] +webp-frames = ["webp", "craft-webp/frames"] +webp-vp8 = ["webp", "craft-webp/vp8"] + window = ["dep:craft-window"] window-appkit = ["window", "craft-window/appkit"] + +wordmodel = ["dep:craft-wordmodel"] +wordmodel-test-support = ["wordmodel", "craft-wordmodel/test-support"] + +xcf = ["dep:craft-xcf"] + +xls = ["dep:craft-xls"] + +xlsx = ["dep:craft-xlsx"] + +xml = ["dep:craft-xml"] + +y4m = ["dep:craft-y4m"] + +zip = ["dep:craft-zip"] +zip-test-support = ["zip", "craft-zip/test-support"] From 24db3f0b562dd02414cbb0581d537039b9b3d139 Mon Sep 17 00:00:00 2001 From: aiongg Date: Sat, 14 Nov 2026 03:52:53 +0000 Subject: [PATCH 03/15] Revert "Facade: features for the format crates from the last main merge" This reverts commit 848e44779e9620dc6ab8ccc8e963d289e594bc8f. --- crates/craft/Cargo.toml | 309 ---------------------------------------- 1 file changed, 309 deletions(-) diff --git a/crates/craft/Cargo.toml b/crates/craft/Cargo.toml index 4b0dd0a0c..3c9c844d3 100644 --- a/crates/craft/Cargo.toml +++ b/crates/craft/Cargo.toml @@ -106,39 +106,18 @@ screen-testing = [ "craft-timeline?/screen-testing", "craft-update?/screen-testing", ] -aaf = ["dep:craft-aaf"] - -aep = ["dep:craft-aep"] - -affinity = ["dep:craft-affinity"] -affinity-synth = ["affinity", "craft-affinity/synth"] - ai-core = ["dep:craft-ai-core"] -assuan = ["dep:craft-assuan"] - atomic = ["dep:craft-atomic"] audio = ["dep:craft-audio"] -audio-aac-decode = ["audio", "craft-audio/aac-decode"] -audio-aac-encode = ["audio", "craft-audio/aac-encode"] -audio-ac3-decode = ["audio", "craft-audio/ac3-decode"] -audio-ac3-encode = ["audio", "craft-audio/ac3-encode"] -audio-alac-decode = ["audio", "craft-audio/alac-decode"] -audio-alac-encode = ["audio", "craft-audio/alac-encode"] audio-decode = ["audio", "craft-audio/decode"] audio-decode-native = ["audio", "craft-audio/decode-native"] -audio-eac3-encode = ["audio", "craft-audio/eac3-encode"] audio-encode = ["audio", "craft-audio/encode"] audio-flac-encode = ["audio", "craft-audio/flac-encode"] audio-lossless-encode = ["audio", "craft-audio/lossless-encode"] -audio-mp3-decode = ["audio", "craft-audio/mp3-decode"] -audio-mp3-encode = ["audio", "craft-audio/mp3-encode"] -audio-mpa-decode = ["audio", "craft-audio/mpa-decode"] -audio-opus-decode = ["audio", "craft-audio/opus-decode"] audio-pcm-encode = ["audio", "craft-audio/pcm-encode"] audio-peaks = ["audio", "craft-audio/peaks"] -audio-rayon = ["audio", "craft-audio/rayon"] audio-serde = ["audio", "craft-audio/serde"] audio-symphonia = ["audio", "craft-audio/symphonia"] @@ -146,75 +125,23 @@ automation = ["dep:craft-automation", "keymap"] browse = ["dep:craft-browse"] -captions = ["dep:craft-captions"] - -cfb = ["dep:craft-cfb"] - cms = ["dep:craft-cms"] -codepage = ["dep:craft-codepage"] - color = ["dep:craft-color", "keymap", "settings", "window", "platform"] -crs = ["dep:craft-crs"] - crw = ["dep:craft-crw"] -csv = ["dep:craft-csv"] - -dav = ["dep:craft-dav"] - -designcraft-format = ["dep:craft-designcraft-format"] - dialogs = ["dep:craft-dialogs"] # native only: rfd's folder picker and file paths doc = ["dep:craft-doc"] doc-pcraft-pixels = ["doc", "craft-doc/pcraft-pixels"] -doc-binary = ["dep:craft-doc-binary"] - docpath = ["dep:craft-docpath"] -document-bundle = ["dep:craft-document-bundle"] - -docx = ["dep:craft-docx"] - -dpx = ["dep:craft-dpx"] - draw = ["dep:craft-draw", "keymap", "color", "settings"] -drawingml = ["dep:craft-drawingml"] - -dwg = ["dep:craft-dwg"] - -dxf = ["dep:craft-dxf"] - ecproj-format = ["dep:craft-ecproj-format"] -eps = ["dep:craft-eps"] -eps-paths = ["eps", "craft-eps/paths"] - -epub = ["dep:craft-epub"] - -ews = ["dep:craft-ews"] - -exr = ["dep:craft-exr"] -exr-decode = ["exr", "craft-exr/decode"] - -fig = ["dep:craft-fig"] - -figcraft-format = ["dep:craft-figcraft-format"] - -figma-rest = ["dep:craft-figma-rest"] - -file-formats = ["dep:craft-file-formats"] - -file-import = ["dep:craft-file-import"] - -flags = ["dep:craft-flags"] - -flow = ["dep:craft-flow"] - font-catalog = ["dep:craft-font-catalog"] font-catalog-system = ["font-catalog", "craft-font-catalog/system"] @@ -225,141 +152,46 @@ font-store-bundled-index = ["font-store", "craft-font-store/bundled-index"] font-subset = ["dep:craft-font-subset"] # native only: HarfBuzz's C++ builds with the target's C++ compiler -gainmap = ["dep:craft-gainmap"] - -gcode = ["dep:craft-gcode"] - -gif = ["dep:craft-gif"] -gif-frames = ["gif", "craft-gif/frames"] - -hdr = ["dep:craft-hdr"] - -heif = ["dep:craft-heif"] -heif-decode = ["heif", "craft-heif/decode"] -heif-metadata = ["heif", "craft-heif/metadata"] -heif-testdata = ["heif", "craft-heif/testdata"] - -html = ["dep:craft-html"] -html-flow = ["html", "craft-html/flow"] - i18n-collate = ["craft-i18n/collate"] -ical = ["dep:craft-ical"] - -idml = ["dep:craft-idml"] - imaging = ["dep:craft-imaging", "keymap"] -indd = ["dep:craft-indd"] - -jmap = ["dep:craft-jmap"] - jpeg = ["dep:craft-jpeg"] keymap = ["dep:craft-keymap"] keymap-egui = ["keymap", "craft-keymap/egui"] -kiwi = ["dep:craft-kiwi"] - -kra = ["dep:craft-kra"] - -latex = ["dep:craft-latex"] - layers = ["dep:craft-layers"] -lottie = ["dep:craft-lottie"] - -markdown = ["dep:craft-markdown"] - -materialx = ["dep:craft-materialx"] - -math = ["dep:craft-math"] - media = ["dep:craft-media"] -media-avi = ["media", "craft-media/avi"] media-bitstream = ["media", "craft-media/bitstream"] media-isobmff = ["media", "craft-media/isobmff"] media-matroska = ["media", "craft-media/matroska"] -media-mpegts = ["media", "craft-media/mpegts"] -media-mxf = ["media", "craft-media/mxf"] media-ogg = ["media", "craft-media/ogg"] media-serde = ["media", "craft-media/serde"] menu = ["dep:craft-menu"] -mesh = ["dep:craft-mesh"] -mesh-fbx = ["mesh", "craft-mesh/fbx"] -mesh-gltf = ["mesh", "craft-mesh/gltf"] -mesh-obj = ["mesh", "craft-mesh/obj"] -mesh-ply = ["mesh", "craft-mesh/ply"] -mesh-stl = ["mesh", "craft-mesh/stl"] -mesh-threemf = ["mesh", "craft-mesh/threemf"] - -metadata = ["dep:craft-metadata"] - -metafile = ["dep:craft-metafile"] -metafile-write = ["metafile", "craft-metafile/write"] - -midi = ["dep:craft-midi"] -midi-serde = ["midi", "craft-midi/serde"] - -mime = ["dep:craft-mime"] -mime-detect = ["mime", "craft-mime/detect"] - -odf = ["dep:craft-odf"] -odf-text = ["odf", "craft-odf/text"] - -ods = ["dep:craft-ods"] - -offcrypto = ["dep:craft-offcrypto"] - -opc = ["dep:craft-opc"] -opc-test-support = ["opc", "craft-opc/test-support"] - -openpgp = ["dep:craft-openpgp"] - -ora = ["dep:craft-ora"] - pages = ["dep:craft-pages"] -pcraft-bundle = ["dep:craft-pcraft-bundle"] - pcraft-format = ["dep:craft-pcraft-format"] pdf = ["dep:craft-pdf"] -pdf-cos = ["pdf", "craft-pdf/cos"] -pdf-crypt = ["pdf", "craft-pdf/crypt"] -pdf-filters = ["pdf", "craft-pdf/filters"] pdf-interpret = ["pdf", "craft-pdf/interpret"] -pdf-paths = ["pdf", "craft-pdf/paths"] pdf-raster = ["pdf", "craft-pdf/raster"] pdf-read = ["pdf", "craft-pdf/read"] pdf-write = ["pdf", "craft-pdf/write"] pdf-write-pdf = ["pdf", "craft-pdf/write-pdf"] pdf-write-simple-text = ["pdf", "craft-pdf/write-simple-text"] -pdn = ["dep:craft-pdn"] - -penpot = ["dep:craft-penpot"] - -pkcs7 = ["dep:craft-pkcs7"] - platform = ["dep:craft-platform"] platform-appearance = ["platform", "craft-platform/appearance"] platform-browser = ["platform", "craft-platform/browser"] platform-clipboard = ["platform", "craft-platform/clipboard"] platform-pointer = ["platform", "craft-platform/pointer"] platform-screen = ["platform", "craft-platform/screen"] -platform-testing = ["platform", "craft-platform/testing"] platform-usage = ["platform", "craft-platform/usage"] -plotter = ["dep:craft-plotter"] -plotter-serde = ["plotter", "craft-plotter/serde"] - -pptx = ["dep:craft-pptx"] - -prc = ["dep:craft-prc"] - prepress = ["dep:craft-prepress"] prepress-flatten = ["prepress", "craft-prepress/flatten"] @@ -367,69 +199,12 @@ print = ["dep:craft-print"] proof = ["dep:craft-proof"] -psd = ["dep:craft-psd"] -psd-corpus = ["psd", "craft-psd/corpus"] -psd-serde = ["psd", "craft-psd/serde"] -psd-testgen = ["psd", "craft-psd/testgen"] - -pst = ["dep:craft-pst"] -pst-test-writer = ["pst", "craft-pst/test-writer"] - quit = ["dep:craft-quit"] -raster-codecs = ["dep:craft-raster-codecs"] - -raw = ["dep:craft-raw"] -raw-arw = ["raw", "craft-raw/arw"] -raw-cr2 = ["raw", "craft-raw/cr2"] -raw-cr3 = ["raw", "craft-raw/cr3"] -raw-crw = ["raw", "craft-raw/crw"] -raw-dng = ["raw", "craft-raw/dng"] -raw-erf = ["raw", "craft-raw/erf"] -raw-hasselblad = ["raw", "craft-raw/hasselblad"] -raw-jxl = ["raw", "craft-raw/jxl"] -raw-kodak = ["raw", "craft-raw/kodak"] -raw-mef = ["raw", "craft-raw/mef"] -raw-mrw = ["raw", "craft-raw/mrw"] -raw-nef = ["raw", "craft-raw/nef"] -raw-orf = ["raw", "craft-raw/orf"] -raw-pef = ["raw", "craft-raw/pef"] -raw-raf = ["raw", "craft-raw/raf"] -raw-rw2 = ["raw", "craft-raw/rw2"] -raw-srw = ["raw", "craft-raw/srw"] - review = ["dep:craft-review", "keymap"] -rtf = ["dep:craft-rtf"] -rtf-doc = ["rtf", "craft-rtf/doc"] -rtf-outlook = ["rtf", "craft-rtf/outlook"] - -scraft-format = ["dep:craft-scraft-format"] - settings = ["dep:craft-settings"] -sf2 = ["dep:craft-sf2"] -sf2-test-support = ["sf2", "craft-sf2/test-support"] - -sheet = ["dep:craft-sheet"] - -silhouette-studio = ["dep:craft-silhouette-studio"] - -sketch = ["dep:craft-sketch"] - -stencilcraft-document = ["dep:craft-stencilcraft-document"] - -stencilcraft-format = ["dep:craft-stencilcraft-format"] - -stream-codecs = ["dep:craft-stream-codecs"] - -svg = ["dep:craft-svg"] -svg-tree = ["svg", "craft-svg/tree"] -svg-tree-system-fonts = ["svg", "craft-svg/tree-system-fonts"] -svg-tree-text = ["svg", "craft-svg/tree-text"] - -svg-paths = ["dep:craft-svg-paths"] - table = ["dep:craft-table", "keymap"] text = ["dep:craft-text"] @@ -494,17 +269,9 @@ text-turkish = ["text", "craft-text/turkish"] text-turkmen = ["text", "craft-text/turkmen"] text-ukrainian = ["text", "craft-text/ukrainian"] -tga = ["dep:craft-tga"] - theme-store = ["dep:craft-theme-store"] -tiff = ["dep:craft-tiff"] - -time = ["dep:craft-time"] - timeline = ["dep:craft-timeline", "keymap"] -timeline-otio = ["timeline", "craft-timeline/otio"] -timeline-xml = ["timeline", "craft-timeline/xml"] ui-app = ["ui", "craft-ui/app"] ui-color_fonts = ["ui", "craft-ui/color_fonts"] @@ -512,89 +279,13 @@ ui-snapshot = ["ui", "craft-ui/snapshot"] ui-system_fonts = ["ui", "craft-ui/system_fonts"] ui-testing = ["ui", "craft-ui/testing"] -ui-canvas = ["dep:craft-ui-canvas"] -ui-canvas-testing = ["ui-canvas", "craft-ui-canvas/testing"] - -ui-contract = ["dep:craft-ui-contract"] -ui-contract-color_fonts = ["ui-contract", "craft-ui-contract/color_fonts"] -ui-contract-snapshot = ["ui-contract", "craft-ui-contract/snapshot"] -ui-contract-system_fonts = ["ui-contract", "craft-ui-contract/system_fonts"] -ui-contract-testing = ["ui-contract", "craft-ui-contract/testing"] - -ui-panels = ["dep:craft-ui-panels"] -ui-panels-testing = ["ui-panels", "craft-ui-panels/testing"] - -ui-patterns = ["dep:craft-ui-patterns"] -ui-patterns-testing = ["ui-patterns", "craft-ui-patterns/testing"] - -ui-shell = ["dep:craft-ui-shell"] -ui-shell-app = ["ui-shell", "craft-ui-shell/app"] -ui-shell-testing = ["ui-shell", "craft-ui-shell/testing"] - -ui-test-kit = ["dep:craft-ui-test-kit"] - -ui-widgets = ["dep:craft-ui-widgets"] -ui-widgets-testing = ["ui-widgets", "craft-ui-widgets/testing"] - update = ["dep:craft-update"] # native only: downloads and installs through getrandom without wasm support -vcard = ["dep:craft-vcard"] - vectorcraft-format = ["dep:craft-vectorcraft-format"] -vectordrawable = ["dep:craft-vectordrawable"] - -video = ["dep:craft-video"] -video-apv = ["video", "craft-video/apv"] -video-apv-decode = ["video", "craft-video/apv-decode"] -video-apv-encode = ["video", "craft-video/apv-encode"] -video-av1 = ["video", "craft-video/av1"] -video-av1-decode = ["video", "craft-video/av1-decode"] -video-av1-encode = ["video", "craft-video/av1-encode"] -video-dnx = ["video", "craft-video/dnx"] -video-h264 = ["video", "craft-video/h264"] -video-h264-decode = ["video", "craft-video/h264-decode"] -video-h264-encode = ["video", "craft-video/h264-encode"] -video-hevc = ["video", "craft-video/hevc"] -video-hevc-decode = ["video", "craft-video/hevc-decode"] -video-hevc-encode = ["video", "craft-video/hevc-encode"] -video-mpeg2 = ["video", "craft-video/mpeg2"] -video-mpeg2-decode = ["video", "craft-video/mpeg2-decode"] -video-mpeg2-encode = ["video", "craft-video/mpeg2-encode"] -video-mpeg4 = ["video", "craft-video/mpeg4"] -video-mpeg4-encode = ["video", "craft-video/mpeg4-encode"] -video-prores = ["video", "craft-video/prores"] -video-threads = ["video", "craft-video/threads"] -video-vp8 = ["video", "craft-video/vp8"] -video-vp8-decode = ["video", "craft-video/vp8-decode"] -video-vp8-encode = ["video", "craft-video/vp8-encode"] -video-vp9 = ["video", "craft-video/vp9"] -video-vp9-decode = ["video", "craft-video/vp9-decode"] -video-vp9-encode = ["video", "craft-video/vp9-encode"] - web-api = ["dep:craft-web-api"] web-host = ["dep:craft-web-host"] -webp = ["dep:craft-webp"] -webp-frames = ["webp", "craft-webp/frames"] -webp-vp8 = ["webp", "craft-webp/vp8"] - window = ["dep:craft-window"] window-appkit = ["window", "craft-window/appkit"] - -wordmodel = ["dep:craft-wordmodel"] -wordmodel-test-support = ["wordmodel", "craft-wordmodel/test-support"] - -xcf = ["dep:craft-xcf"] - -xls = ["dep:craft-xls"] - -xlsx = ["dep:craft-xlsx"] - -xml = ["dep:craft-xml"] - -y4m = ["dep:craft-y4m"] - -zip = ["dep:craft-zip"] -zip-test-support = ["zip", "craft-zip/test-support"] From aab2fd5ac73151df6e520c7f2497fdab26ab10d8 Mon Sep 17 00:00:00 2001 From: aiongg Date: Sat, 14 Nov 2026 03:56:04 +0000 Subject: [PATCH 04/15] craft: add the file-format and protocol crates to the facade; UPDATE_FACADE writes dependencies and re-exports --- Cargo.lock | 92 ++++++++ Cargo.toml | 1 + crates/craft/Cargo.toml | 375 +++++++++++++++++++++++++++++++ crates/craft/src/lib.rs | 184 +++++++++++++++ crates/craft/tests/common/mod.rs | 8 + crates/craft/tests/features.rs | 46 +++- 6 files changed, 705 insertions(+), 1 deletion(-) diff --git a/Cargo.lock b/Cargo.lock index 416765ba8..d6edcc20d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1396,53 +1396,145 @@ dependencies = [ name = "craft" version = "0.1.0" dependencies = [ + "craft-aaf", + "craft-aep", + "craft-affinity", "craft-ai-core", + "craft-assuan", "craft-atomic", "craft-audio", "craft-automation", "craft-behavior", "craft-browse", + "craft-captions", + "craft-cfb", "craft-cms", + "craft-codepage", "craft-color", + "craft-crs", "craft-crw", + "craft-csv", + "craft-dav", + "craft-designcraft-format", "craft-dialogs", "craft-doc", + "craft-doc-binary", "craft-docpath", + "craft-document-bundle", + "craft-docx", + "craft-dpx", "craft-draw", + "craft-drawingml", + "craft-dwg", + "craft-dxf", "craft-ecproj-format", + "craft-eps", + "craft-epub", + "craft-ews", + "craft-exr", + "craft-fig", + "craft-figcraft-format", + "craft-figma-rest", + "craft-file-formats", + "craft-file-import", + "craft-flags", + "craft-flow", "craft-font-catalog", "craft-font-manager", "craft-font-store", "craft-font-subset", + "craft-gainmap", + "craft-gcode", + "craft-gif", + "craft-hdr", + "craft-heif", "craft-host", + "craft-html", "craft-i18n", + "craft-ical", + "craft-idml", "craft-imaging", + "craft-indd", + "craft-jmap", "craft-jpeg", "craft-keymap", + "craft-kiwi", + "craft-kra", + "craft-latex", "craft-layers", + "craft-lottie", + "craft-markdown", + "craft-materialx", + "craft-math", "craft-media", "craft-menu", + "craft-mesh", + "craft-metadata", + "craft-metafile", + "craft-midi", + "craft-mime", + "craft-odf", + "craft-ods", + "craft-offcrypto", + "craft-opc", + "craft-openpgp", + "craft-ora", "craft-pages", + "craft-pcraft-bundle", "craft-pcraft-format", "craft-pdf 0.1.0", + "craft-pdn", + "craft-penpot", + "craft-pkcs7", "craft-platform", + "craft-plotter", + "craft-pptx", + "craft-prc", "craft-prepress", "craft-print", "craft-proof", + "craft-psd", + "craft-pst", "craft-quit", + "craft-raster-codecs", + "craft-raw", "craft-review", + "craft-rtf", + "craft-scraft-format", "craft-settings", + "craft-sf2", + "craft-sheet", + "craft-silhouette-studio", + "craft-sketch", + "craft-stencilcraft-document", + "craft-stencilcraft-format", + "craft-stream-codecs", + "craft-svg", "craft-table", "craft-text", + "craft-tga", "craft-theme", "craft-theme-store", + "craft-tiff", + "craft-time", "craft-timeline", "craft-ui", "craft-update", + "craft-vcard", "craft-vectorcraft-format", + "craft-vectordrawable", + "craft-video", "craft-web-api", "craft-web-host", + "craft-webp", "craft-window", + "craft-wordmodel", + "craft-xcf", + "craft-xls", + "craft-xlsx", + "craft-xml", + "craft-y4m", + "craft-zip", "egui", "toml", ] diff --git a/Cargo.toml b/Cargo.toml index 77502bb4b..069c8e680 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -138,6 +138,7 @@ craft-sheet = { path = "crates/sheet" } craft-sketch = { path = "crates/sketch" } craft-review = { path = "crates/review" } craft-settings = { path = "crates/settings" } +craft-figcraft-format = { path = "crates/figcraft-format" } craft-scraft-format = { path = "crates/scraft-format" } craft-time = { path = "crates/time" } craft-silhouette-studio = { path = "crates/silhouette-studio" } diff --git a/crates/craft/Cargo.toml b/crates/craft/Cargo.toml index 3c9c844d3..4ab09f5b1 100644 --- a/crates/craft/Cargo.toml +++ b/crates/craft/Cargo.toml @@ -61,6 +61,98 @@ craft-web-api = { workspace = true, optional = true } craft-web-host = { workspace = true, optional = true } craft-window = { workspace = true, optional = true } craft-ui = { workspace = true, optional = true } +craft-aaf = { workspace = true, optional = true } +craft-aep = { workspace = true, optional = true } +craft-affinity = { workspace = true, optional = true } +craft-assuan = { workspace = true, optional = true } +craft-captions = { workspace = true, optional = true } +craft-cfb = { workspace = true, optional = true } +craft-codepage = { workspace = true, optional = true } +craft-crs = { workspace = true, optional = true } +craft-csv = { workspace = true, optional = true } +craft-dav = { workspace = true, optional = true } +craft-designcraft-format = { workspace = true, optional = true } +craft-doc-binary = { workspace = true, optional = true } +craft-document-bundle = { workspace = true, optional = true } +craft-docx = { workspace = true, optional = true } +craft-dpx = { workspace = true, optional = true } +craft-drawingml = { workspace = true, optional = true } +craft-dwg = { workspace = true, optional = true } +craft-dxf = { workspace = true, optional = true } +craft-eps = { workspace = true, optional = true } +craft-epub = { workspace = true, optional = true } +craft-ews = { workspace = true, optional = true } +craft-exr = { workspace = true, optional = true } +craft-fig = { workspace = true, optional = true } +craft-figcraft-format = { workspace = true, optional = true } +craft-figma-rest = { workspace = true, optional = true } +craft-file-formats = { workspace = true, optional = true } +craft-file-import = { workspace = true, optional = true } +craft-flags = { workspace = true, optional = true } +craft-flow = { workspace = true, optional = true } +craft-gainmap = { workspace = true, optional = true } +craft-gcode = { workspace = true, optional = true } +craft-gif = { workspace = true, optional = true } +craft-hdr = { workspace = true, optional = true } +craft-heif = { workspace = true, optional = true } +craft-html = { workspace = true, optional = true } +craft-ical = { workspace = true, optional = true } +craft-idml = { workspace = true, optional = true } +craft-indd = { workspace = true, optional = true } +craft-jmap = { workspace = true, optional = true } +craft-kiwi = { workspace = true, optional = true } +craft-kra = { workspace = true, optional = true } +craft-latex = { workspace = true, optional = true } +craft-lottie = { workspace = true, optional = true } +craft-markdown = { workspace = true, optional = true } +craft-materialx = { workspace = true, optional = true } +craft-math = { workspace = true, optional = true } +craft-mesh = { workspace = true, optional = true } +craft-metadata = { workspace = true, optional = true } +craft-metafile = { workspace = true, optional = true } +craft-midi = { workspace = true, optional = true } +craft-mime = { workspace = true, optional = true } +craft-odf = { workspace = true, optional = true } +craft-ods = { workspace = true, optional = true } +craft-offcrypto = { workspace = true, optional = true } +craft-opc = { workspace = true, optional = true } +craft-openpgp = { workspace = true, optional = true } +craft-ora = { workspace = true, optional = true } +craft-pcraft-bundle = { workspace = true, optional = true } +craft-pdn = { workspace = true, optional = true } +craft-penpot = { workspace = true, optional = true } +craft-pkcs7 = { workspace = true, optional = true } +craft-plotter = { workspace = true, optional = true } +craft-pptx = { workspace = true, optional = true } +craft-prc = { workspace = true, optional = true } +craft-psd = { workspace = true, optional = true } +craft-pst = { workspace = true, optional = true } +craft-raster-codecs = { workspace = true, optional = true } +craft-raw = { workspace = true, optional = true } +craft-rtf = { workspace = true, optional = true } +craft-scraft-format = { workspace = true, optional = true } +craft-sf2 = { workspace = true, optional = true } +craft-sheet = { workspace = true, optional = true } +craft-silhouette-studio = { workspace = true, optional = true } +craft-sketch = { workspace = true, optional = true } +craft-stencilcraft-document = { workspace = true, optional = true } +craft-stencilcraft-format = { workspace = true, optional = true } +craft-stream-codecs = { workspace = true, optional = true } +craft-svg = { workspace = true, optional = true } +craft-tga = { workspace = true, optional = true } +craft-tiff = { workspace = true, optional = true } +craft-time = { workspace = true, optional = true } +craft-vcard = { workspace = true, optional = true } +craft-vectordrawable = { workspace = true, optional = true } +craft-video = { workspace = true, optional = true } +craft-webp = { workspace = true, optional = true } +craft-wordmodel = { workspace = true, optional = true } +craft-xcf = { workspace = true, optional = true } +craft-xls = { workspace = true, optional = true } +craft-xlsx = { workspace = true, optional = true } +craft-xml = { workspace = true, optional = true } +craft-y4m = { workspace = true, optional = true } +craft-zip = { workspace = true, optional = true } [features] ui = [ @@ -106,18 +198,39 @@ screen-testing = [ "craft-timeline?/screen-testing", "craft-update?/screen-testing", ] +aaf = ["dep:craft-aaf"] + +aep = ["dep:craft-aep"] + +affinity = ["dep:craft-affinity"] +affinity-synth = ["affinity", "craft-affinity/synth"] + ai-core = ["dep:craft-ai-core"] +assuan = ["dep:craft-assuan"] + atomic = ["dep:craft-atomic"] audio = ["dep:craft-audio"] +audio-aac-decode = ["audio", "craft-audio/aac-decode"] +audio-aac-encode = ["audio", "craft-audio/aac-encode"] +audio-ac3-decode = ["audio", "craft-audio/ac3-decode"] +audio-ac3-encode = ["audio", "craft-audio/ac3-encode"] +audio-alac-decode = ["audio", "craft-audio/alac-decode"] +audio-alac-encode = ["audio", "craft-audio/alac-encode"] audio-decode = ["audio", "craft-audio/decode"] audio-decode-native = ["audio", "craft-audio/decode-native"] +audio-eac3-encode = ["audio", "craft-audio/eac3-encode"] audio-encode = ["audio", "craft-audio/encode"] audio-flac-encode = ["audio", "craft-audio/flac-encode"] audio-lossless-encode = ["audio", "craft-audio/lossless-encode"] +audio-mp3-decode = ["audio", "craft-audio/mp3-decode"] +audio-mp3-encode = ["audio", "craft-audio/mp3-encode"] +audio-mpa-decode = ["audio", "craft-audio/mpa-decode"] +audio-opus-decode = ["audio", "craft-audio/opus-decode"] audio-pcm-encode = ["audio", "craft-audio/pcm-encode"] audio-peaks = ["audio", "craft-audio/peaks"] +audio-rayon = ["audio", "craft-audio/rayon"] audio-serde = ["audio", "craft-audio/serde"] audio-symphonia = ["audio", "craft-audio/symphonia"] @@ -125,23 +238,75 @@ automation = ["dep:craft-automation", "keymap"] browse = ["dep:craft-browse"] +captions = ["dep:craft-captions"] + +cfb = ["dep:craft-cfb"] + cms = ["dep:craft-cms"] +codepage = ["dep:craft-codepage"] + color = ["dep:craft-color", "keymap", "settings", "window", "platform"] +crs = ["dep:craft-crs"] + crw = ["dep:craft-crw"] +csv = ["dep:craft-csv"] + +dav = ["dep:craft-dav"] + +designcraft-format = ["dep:craft-designcraft-format"] + dialogs = ["dep:craft-dialogs"] # native only: rfd's folder picker and file paths doc = ["dep:craft-doc"] doc-pcraft-pixels = ["doc", "craft-doc/pcraft-pixels"] +doc-binary = ["dep:craft-doc-binary"] + docpath = ["dep:craft-docpath"] +document-bundle = ["dep:craft-document-bundle"] + +docx = ["dep:craft-docx"] + +dpx = ["dep:craft-dpx"] + draw = ["dep:craft-draw", "keymap", "color", "settings"] +drawingml = ["dep:craft-drawingml"] + +dwg = ["dep:craft-dwg"] + +dxf = ["dep:craft-dxf"] + ecproj-format = ["dep:craft-ecproj-format"] +eps = ["dep:craft-eps"] +eps-paths = ["eps", "craft-eps/paths"] + +epub = ["dep:craft-epub"] + +ews = ["dep:craft-ews"] + +exr = ["dep:craft-exr"] +exr-decode = ["exr", "craft-exr/decode"] + +fig = ["dep:craft-fig"] + +figcraft-format = ["dep:craft-figcraft-format"] + +figma-rest = ["dep:craft-figma-rest"] + +file-formats = ["dep:craft-file-formats"] + +file-import = ["dep:craft-file-import"] + +flags = ["dep:craft-flags"] + +flow = ["dep:craft-flow"] + font-catalog = ["dep:craft-font-catalog"] font-catalog-system = ["font-catalog", "craft-font-catalog/system"] @@ -152,46 +317,141 @@ font-store-bundled-index = ["font-store", "craft-font-store/bundled-index"] font-subset = ["dep:craft-font-subset"] # native only: HarfBuzz's C++ builds with the target's C++ compiler +gainmap = ["dep:craft-gainmap"] + +gcode = ["dep:craft-gcode"] + +gif = ["dep:craft-gif"] +gif-frames = ["gif", "craft-gif/frames"] + +hdr = ["dep:craft-hdr"] + +heif = ["dep:craft-heif"] +heif-decode = ["heif", "craft-heif/decode"] +heif-metadata = ["heif", "craft-heif/metadata"] +heif-testdata = ["heif", "craft-heif/testdata"] + +html = ["dep:craft-html"] +html-flow = ["html", "craft-html/flow"] + i18n-collate = ["craft-i18n/collate"] +ical = ["dep:craft-ical"] + +idml = ["dep:craft-idml"] + imaging = ["dep:craft-imaging", "keymap"] +indd = ["dep:craft-indd"] + +jmap = ["dep:craft-jmap"] + jpeg = ["dep:craft-jpeg"] keymap = ["dep:craft-keymap"] keymap-egui = ["keymap", "craft-keymap/egui"] +kiwi = ["dep:craft-kiwi"] + +kra = ["dep:craft-kra"] + +latex = ["dep:craft-latex"] + layers = ["dep:craft-layers"] +lottie = ["dep:craft-lottie"] + +markdown = ["dep:craft-markdown"] + +materialx = ["dep:craft-materialx"] + +math = ["dep:craft-math"] + media = ["dep:craft-media"] +media-avi = ["media", "craft-media/avi"] media-bitstream = ["media", "craft-media/bitstream"] media-isobmff = ["media", "craft-media/isobmff"] media-matroska = ["media", "craft-media/matroska"] +media-mpegts = ["media", "craft-media/mpegts"] +media-mxf = ["media", "craft-media/mxf"] media-ogg = ["media", "craft-media/ogg"] media-serde = ["media", "craft-media/serde"] menu = ["dep:craft-menu"] +mesh = ["dep:craft-mesh"] +mesh-fbx = ["mesh", "craft-mesh/fbx"] +mesh-gltf = ["mesh", "craft-mesh/gltf"] +mesh-obj = ["mesh", "craft-mesh/obj"] +mesh-ply = ["mesh", "craft-mesh/ply"] +mesh-stl = ["mesh", "craft-mesh/stl"] +mesh-threemf = ["mesh", "craft-mesh/threemf"] + +metadata = ["dep:craft-metadata"] + +metafile = ["dep:craft-metafile"] +metafile-write = ["metafile", "craft-metafile/write"] + +midi = ["dep:craft-midi"] +midi-serde = ["midi", "craft-midi/serde"] + +mime = ["dep:craft-mime"] +mime-detect = ["mime", "craft-mime/detect"] + +odf = ["dep:craft-odf"] +odf-text = ["odf", "craft-odf/text"] + +ods = ["dep:craft-ods"] + +offcrypto = ["dep:craft-offcrypto"] + +opc = ["dep:craft-opc"] +opc-test-support = ["opc", "craft-opc/test-support"] + +openpgp = ["dep:craft-openpgp"] + +ora = ["dep:craft-ora"] + pages = ["dep:craft-pages"] +pcraft-bundle = ["dep:craft-pcraft-bundle"] + pcraft-format = ["dep:craft-pcraft-format"] pdf = ["dep:craft-pdf"] +pdf-cos = ["pdf", "craft-pdf/cos"] +pdf-crypt = ["pdf", "craft-pdf/crypt"] +pdf-filters = ["pdf", "craft-pdf/filters"] pdf-interpret = ["pdf", "craft-pdf/interpret"] +pdf-paths = ["pdf", "craft-pdf/paths"] pdf-raster = ["pdf", "craft-pdf/raster"] pdf-read = ["pdf", "craft-pdf/read"] pdf-write = ["pdf", "craft-pdf/write"] pdf-write-pdf = ["pdf", "craft-pdf/write-pdf"] pdf-write-simple-text = ["pdf", "craft-pdf/write-simple-text"] +pdn = ["dep:craft-pdn"] + +penpot = ["dep:craft-penpot"] + +pkcs7 = ["dep:craft-pkcs7"] + platform = ["dep:craft-platform"] platform-appearance = ["platform", "craft-platform/appearance"] platform-browser = ["platform", "craft-platform/browser"] platform-clipboard = ["platform", "craft-platform/clipboard"] platform-pointer = ["platform", "craft-platform/pointer"] platform-screen = ["platform", "craft-platform/screen"] +platform-testing = ["platform", "craft-platform/testing"] platform-usage = ["platform", "craft-platform/usage"] +plotter = ["dep:craft-plotter"] +plotter-serde = ["plotter", "craft-plotter/serde"] + +pptx = ["dep:craft-pptx"] + +prc = ["dep:craft-prc"] + prepress = ["dep:craft-prepress"] prepress-flatten = ["prepress", "craft-prepress/flatten"] @@ -199,12 +459,67 @@ print = ["dep:craft-print"] proof = ["dep:craft-proof"] +psd = ["dep:craft-psd"] +psd-corpus = ["psd", "craft-psd/corpus"] +psd-serde = ["psd", "craft-psd/serde"] +psd-testgen = ["psd", "craft-psd/testgen"] + +pst = ["dep:craft-pst"] +pst-test-writer = ["pst", "craft-pst/test-writer"] + quit = ["dep:craft-quit"] +raster-codecs = ["dep:craft-raster-codecs"] + +raw = ["dep:craft-raw"] +raw-arw = ["raw", "craft-raw/arw"] +raw-cr2 = ["raw", "craft-raw/cr2"] +raw-cr3 = ["raw", "craft-raw/cr3"] +raw-crw = ["raw", "craft-raw/crw"] +raw-dng = ["raw", "craft-raw/dng"] +raw-erf = ["raw", "craft-raw/erf"] +raw-hasselblad = ["raw", "craft-raw/hasselblad"] +raw-jxl = ["raw", "craft-raw/jxl"] +raw-kodak = ["raw", "craft-raw/kodak"] +raw-mef = ["raw", "craft-raw/mef"] +raw-mrw = ["raw", "craft-raw/mrw"] +raw-nef = ["raw", "craft-raw/nef"] +raw-orf = ["raw", "craft-raw/orf"] +raw-pef = ["raw", "craft-raw/pef"] +raw-raf = ["raw", "craft-raw/raf"] +raw-rw2 = ["raw", "craft-raw/rw2"] +raw-srw = ["raw", "craft-raw/srw"] + review = ["dep:craft-review", "keymap"] +rtf = ["dep:craft-rtf"] +rtf-doc = ["rtf", "craft-rtf/doc"] +rtf-outlook = ["rtf", "craft-rtf/outlook"] + +scraft-format = ["dep:craft-scraft-format"] + settings = ["dep:craft-settings"] +sf2 = ["dep:craft-sf2"] +sf2-test-support = ["sf2", "craft-sf2/test-support"] + +sheet = ["dep:craft-sheet"] + +silhouette-studio = ["dep:craft-silhouette-studio"] + +sketch = ["dep:craft-sketch"] + +stencilcraft-document = ["dep:craft-stencilcraft-document"] + +stencilcraft-format = ["dep:craft-stencilcraft-format"] + +stream-codecs = ["dep:craft-stream-codecs"] + +svg = ["dep:craft-svg"] +svg-tree = ["svg", "craft-svg/tree"] +svg-tree-system-fonts = ["svg", "craft-svg/tree-system-fonts"] +svg-tree-text = ["svg", "craft-svg/tree-text"] + table = ["dep:craft-table", "keymap"] text = ["dep:craft-text"] @@ -269,9 +584,17 @@ text-turkish = ["text", "craft-text/turkish"] text-turkmen = ["text", "craft-text/turkmen"] text-ukrainian = ["text", "craft-text/ukrainian"] +tga = ["dep:craft-tga"] + theme-store = ["dep:craft-theme-store"] +tiff = ["dep:craft-tiff"] + +time = ["dep:craft-time"] + timeline = ["dep:craft-timeline", "keymap"] +timeline-otio = ["timeline", "craft-timeline/otio"] +timeline-xml = ["timeline", "craft-timeline/xml"] ui-app = ["ui", "craft-ui/app"] ui-color_fonts = ["ui", "craft-ui/color_fonts"] @@ -281,11 +604,63 @@ ui-testing = ["ui", "craft-ui/testing"] update = ["dep:craft-update"] # native only: downloads and installs through getrandom without wasm support +vcard = ["dep:craft-vcard"] + vectorcraft-format = ["dep:craft-vectorcraft-format"] +vectordrawable = ["dep:craft-vectordrawable"] + +video = ["dep:craft-video"] +video-apv = ["video", "craft-video/apv"] +video-apv-decode = ["video", "craft-video/apv-decode"] +video-apv-encode = ["video", "craft-video/apv-encode"] +video-av1 = ["video", "craft-video/av1"] +video-av1-decode = ["video", "craft-video/av1-decode"] +video-av1-encode = ["video", "craft-video/av1-encode"] +video-dnx = ["video", "craft-video/dnx"] +video-h264 = ["video", "craft-video/h264"] +video-h264-decode = ["video", "craft-video/h264-decode"] +video-h264-encode = ["video", "craft-video/h264-encode"] +video-hevc = ["video", "craft-video/hevc"] +video-hevc-decode = ["video", "craft-video/hevc-decode"] +video-hevc-encode = ["video", "craft-video/hevc-encode"] +video-mpeg2 = ["video", "craft-video/mpeg2"] +video-mpeg2-decode = ["video", "craft-video/mpeg2-decode"] +video-mpeg2-encode = ["video", "craft-video/mpeg2-encode"] +video-mpeg4 = ["video", "craft-video/mpeg4"] +video-mpeg4-encode = ["video", "craft-video/mpeg4-encode"] +video-prores = ["video", "craft-video/prores"] +video-threads = ["video", "craft-video/threads"] +video-vp8 = ["video", "craft-video/vp8"] +video-vp8-decode = ["video", "craft-video/vp8-decode"] +video-vp8-encode = ["video", "craft-video/vp8-encode"] +video-vp9 = ["video", "craft-video/vp9"] +video-vp9-decode = ["video", "craft-video/vp9-decode"] +video-vp9-encode = ["video", "craft-video/vp9-encode"] + web-api = ["dep:craft-web-api"] web-host = ["dep:craft-web-host"] +webp = ["dep:craft-webp"] +webp-frames = ["webp", "craft-webp/frames"] +webp-vp8 = ["webp", "craft-webp/vp8"] + window = ["dep:craft-window"] window-appkit = ["window", "craft-window/appkit"] + +wordmodel = ["dep:craft-wordmodel"] +wordmodel-test-support = ["wordmodel", "craft-wordmodel/test-support"] + +xcf = ["dep:craft-xcf"] + +xls = ["dep:craft-xls"] + +xlsx = ["dep:craft-xlsx"] + +xml = ["dep:craft-xml"] + +y4m = ["dep:craft-y4m"] + +zip = ["dep:craft-zip"] +zip-test-support = ["zip", "craft-zip/test-support"] diff --git a/crates/craft/src/lib.rs b/crates/craft/src/lib.rs index cf43819b5..c4fced353 100644 --- a/crates/craft/src/lib.rs +++ b/crates/craft/src/lib.rs @@ -6,8 +6,16 @@ pub mod egui_fork; #[cfg(all(feature = "ui-system_fonts", target_arch = "wasm32"))] compile_error!("`ui-system_fonts` is desktop-only: the system font index needs fontique, which has no web build"); +#[cfg(feature = "aaf")] +pub use craft_aaf as aaf; +#[cfg(feature = "aep")] +pub use craft_aep as aep; +#[cfg(feature = "affinity")] +pub use craft_affinity as affinity; #[cfg(feature = "ai-core")] pub use craft_ai_core as ai_core; +#[cfg(feature = "assuan")] +pub use craft_assuan as assuan; #[cfg(feature = "atomic")] pub use craft_atomic as atomic; #[cfg(feature = "audio")] @@ -17,22 +25,72 @@ pub use craft_automation as automation; pub use craft_behavior as behavior; #[cfg(feature = "browse")] pub use craft_browse as browse; +#[cfg(feature = "captions")] +pub use craft_captions as captions; +#[cfg(feature = "cfb")] +pub use craft_cfb as cfb; #[cfg(feature = "cms")] pub use craft_cms as cms; +#[cfg(feature = "codepage")] +pub use craft_codepage as codepage; #[cfg(feature = "color")] pub use craft_color as color; +#[cfg(feature = "crs")] +pub use craft_crs as crs; #[cfg(feature = "crw")] pub use craft_crw as crw; +#[cfg(feature = "csv")] +pub use craft_csv as csv; +#[cfg(feature = "dav")] +pub use craft_dav as dav; +#[cfg(feature = "designcraft-format")] +pub use craft_designcraft_format as designcraft_format; #[cfg(feature = "dialogs")] pub use craft_dialogs as dialogs; #[cfg(feature = "doc")] pub use craft_doc as doc; +#[cfg(feature = "doc-binary")] +pub use craft_doc_binary as doc_binary; #[cfg(feature = "docpath")] pub use craft_docpath as docpath; +#[cfg(feature = "document-bundle")] +pub use craft_document_bundle as document_bundle; +#[cfg(feature = "docx")] +pub use craft_docx as docx; +#[cfg(feature = "dpx")] +pub use craft_dpx as dpx; #[cfg(feature = "draw")] pub use craft_draw as draw; +#[cfg(feature = "drawingml")] +pub use craft_drawingml as drawingml; +#[cfg(feature = "dwg")] +pub use craft_dwg as dwg; +#[cfg(feature = "dxf")] +pub use craft_dxf as dxf; #[cfg(feature = "ecproj-format")] pub use craft_ecproj_format as ecproj_format; +#[cfg(feature = "eps")] +pub use craft_eps as eps; +#[cfg(feature = "epub")] +pub use craft_epub as epub; +#[cfg(feature = "ews")] +pub use craft_ews as ews; +#[cfg(feature = "exr")] +pub use craft_exr as exr; +#[cfg(feature = "fig")] +pub use craft_fig as fig; +#[cfg(feature = "figcraft-format")] +pub use craft_figcraft_format as figcraft_format; +#[cfg(feature = "figma-rest")] +pub use craft_figma_rest as figma_rest; +#[cfg(feature = "file-formats")] +pub use craft_file_formats as file_formats; +#[cfg(feature = "file-import")] +pub use craft_file_import as file_import; +#[cfg(feature = "flags")] +pub use craft_flags as flags; +#[cfg(feature = "flow")] +pub use craft_flow as flow; #[cfg(feature = "font-catalog")] pub use craft_font_catalog as font_catalog; #[cfg(feature = "font-manager")] @@ -41,61 +99,187 @@ pub use craft_font_manager as font_manager; pub use craft_font_store as font_store; #[cfg(feature = "font-subset")] pub use craft_font_subset as font_subset; +#[cfg(feature = "gainmap")] +pub use craft_gainmap as gainmap; +#[cfg(feature = "gcode")] +pub use craft_gcode as gcode; +#[cfg(feature = "gif")] +pub use craft_gif as gif; +#[cfg(feature = "hdr")] +pub use craft_hdr as hdr; +#[cfg(feature = "heif")] +pub use craft_heif as heif; pub use craft_host as host; +#[cfg(feature = "html")] +pub use craft_html as html; pub use craft_i18n as i18n; +#[cfg(feature = "ical")] +pub use craft_ical as ical; +#[cfg(feature = "idml")] +pub use craft_idml as idml; #[cfg(feature = "imaging")] pub use craft_imaging as imaging; +#[cfg(feature = "indd")] +pub use craft_indd as indd; +#[cfg(feature = "jmap")] +pub use craft_jmap as jmap; #[cfg(feature = "jpeg")] pub use craft_jpeg as jpeg; #[cfg(feature = "keymap")] pub use craft_keymap as keymap; +#[cfg(feature = "kiwi")] +pub use craft_kiwi as kiwi; +#[cfg(feature = "kra")] +pub use craft_kra as kra; +#[cfg(feature = "latex")] +pub use craft_latex as latex; #[cfg(feature = "layers")] pub use craft_layers as layers; +#[cfg(feature = "lottie")] +pub use craft_lottie as lottie; +#[cfg(feature = "markdown")] +pub use craft_markdown as markdown; +#[cfg(feature = "materialx")] +pub use craft_materialx as materialx; +#[cfg(feature = "math")] +pub use craft_math as math; #[cfg(feature = "media")] pub use craft_media as media; #[cfg(feature = "menu")] pub use craft_menu as menu; +#[cfg(feature = "mesh")] +pub use craft_mesh as mesh; +#[cfg(feature = "metadata")] +pub use craft_metadata as metadata; +#[cfg(feature = "metafile")] +pub use craft_metafile as metafile; +#[cfg(feature = "midi")] +pub use craft_midi as midi; +#[cfg(feature = "mime")] +pub use craft_mime as mime; +#[cfg(feature = "odf")] +pub use craft_odf as odf; +#[cfg(feature = "ods")] +pub use craft_ods as ods; +#[cfg(feature = "offcrypto")] +pub use craft_offcrypto as offcrypto; +#[cfg(feature = "opc")] +pub use craft_opc as opc; +#[cfg(feature = "openpgp")] +pub use craft_openpgp as openpgp; +#[cfg(feature = "ora")] +pub use craft_ora as ora; #[cfg(feature = "pages")] pub use craft_pages as pages; +#[cfg(feature = "pcraft-bundle")] +pub use craft_pcraft_bundle as pcraft_bundle; #[cfg(feature = "pcraft-format")] pub use craft_pcraft_format as pcraft_format; #[cfg(feature = "pdf")] pub use craft_pdf as pdf; +#[cfg(feature = "pdn")] +pub use craft_pdn as pdn; +#[cfg(feature = "penpot")] +pub use craft_penpot as penpot; +#[cfg(feature = "pkcs7")] +pub use craft_pkcs7 as pkcs7; #[cfg(feature = "platform")] pub use craft_platform as platform; +#[cfg(feature = "plotter")] +pub use craft_plotter as plotter; +#[cfg(feature = "pptx")] +pub use craft_pptx as pptx; +#[cfg(feature = "prc")] +pub use craft_prc as prc; #[cfg(feature = "prepress")] pub use craft_prepress as prepress; #[cfg(feature = "print")] pub use craft_print as print; #[cfg(feature = "proof")] pub use craft_proof as proof; +#[cfg(feature = "psd")] +pub use craft_psd as psd; +#[cfg(feature = "pst")] +pub use craft_pst as pst; #[cfg(feature = "quit")] pub use craft_quit as quit; +#[cfg(feature = "raster-codecs")] +pub use craft_raster_codecs as raster_codecs; +#[cfg(feature = "raw")] +pub use craft_raw as raw; #[cfg(feature = "review")] pub use craft_review as review; +#[cfg(feature = "rtf")] +pub use craft_rtf as rtf; +#[cfg(feature = "scraft-format")] +pub use craft_scraft_format as scraft_format; #[cfg(feature = "settings")] pub use craft_settings as settings; +#[cfg(feature = "sf2")] +pub use craft_sf2 as sf2; +#[cfg(feature = "sheet")] +pub use craft_sheet as sheet; +#[cfg(feature = "silhouette-studio")] +pub use craft_silhouette_studio as silhouette_studio; +#[cfg(feature = "sketch")] +pub use craft_sketch as sketch; +#[cfg(feature = "stencilcraft-document")] +pub use craft_stencilcraft_document as stencilcraft_document; +#[cfg(feature = "stencilcraft-format")] +pub use craft_stencilcraft_format as stencilcraft_format; +#[cfg(feature = "stream-codecs")] +pub use craft_stream_codecs as stream_codecs; +#[cfg(feature = "svg")] +pub use craft_svg as svg; #[cfg(feature = "table")] pub use craft_table as table; #[cfg(feature = "text")] pub use craft_text as text; +#[cfg(feature = "tga")] +pub use craft_tga as tga; pub use craft_theme as theme; #[cfg(feature = "theme-store")] pub use craft_theme_store as theme_store; +#[cfg(feature = "tiff")] +pub use craft_tiff as tiff; +#[cfg(feature = "time")] +pub use craft_time as time; #[cfg(feature = "timeline")] pub use craft_timeline as timeline; #[cfg(feature = "ui")] pub use craft_ui as ui; #[cfg(feature = "update")] pub use craft_update as update; +#[cfg(feature = "vcard")] +pub use craft_vcard as vcard; #[cfg(feature = "vectorcraft-format")] pub use craft_vectorcraft_format as vectorcraft_format; +#[cfg(feature = "vectordrawable")] +pub use craft_vectordrawable as vectordrawable; +#[cfg(feature = "video")] +pub use craft_video as video; #[cfg(feature = "web-api")] pub use craft_web_api as web_api; #[cfg(feature = "web-host")] pub use craft_web_host as web_host; +#[cfg(feature = "webp")] +pub use craft_webp as webp; #[cfg(feature = "window")] pub use craft_window as window; +#[cfg(feature = "wordmodel")] +pub use craft_wordmodel as wordmodel; +#[cfg(feature = "xcf")] +pub use craft_xcf as xcf; +#[cfg(feature = "xls")] +pub use craft_xls as xls; +#[cfg(feature = "xlsx")] +pub use craft_xlsx as xlsx; +#[cfg(feature = "xml")] +pub use craft_xml as xml; +#[cfg(feature = "y4m")] +pub use craft_y4m as y4m; +#[cfg(feature = "zip")] +pub use craft_zip as zip; #[cfg(feature = "ui")] pub use egui; diff --git a/crates/craft/tests/common/mod.rs b/crates/craft/tests/common/mod.rs index 951fa1c43..e8d98a5ef 100644 --- a/crates/craft/tests/common/mod.rs +++ b/crates/craft/tests/common/mod.rs @@ -16,6 +16,14 @@ pub const NOT_IN_FACADE: &[(&str, &str)] = &[ ("ui-bench", "a tool: the release-mode benchmark of the UI library"), ("ui-gallery", "a tool: the story gallery application"), ("ui-macros", "a proc-macro crate that craft-ui re-exports"), + ("svg-paths", "the former name of craft-svg's geometry reader; re-exports it"), + ("ui-canvas", "part of craft-ui, which the facade exposes as `ui`"), + ("ui-contract", "part of craft-ui, which the facade exposes as `ui`"), + ("ui-panels", "part of craft-ui, which the facade exposes as `ui`"), + ("ui-patterns", "part of craft-ui, which the facade exposes as `ui`"), + ("ui-shell", "part of craft-ui, which the facade exposes as `ui`"), + ("ui-test-kit", "test support shared by craft-ui's integration binaries"), + ("ui-widgets", "part of craft-ui, which the facade exposes as `ui`"), ("win32", "the `unsafe` Win32 calls behind a safe API, used by craft-window"), ]; diff --git a/crates/craft/tests/features.rs b/crates/craft/tests/features.rs index 47dde420d..613f9ca75 100644 --- a/crates/craft/tests/features.rs +++ b/crates/craft/tests/features.rs @@ -1,5 +1,6 @@ //! The facade's `[features]` table is written from the member crates' manifests. -//! `UPDATE_FACADE=1 cargo test -p craft -- integration::features` rewrites the checked-in table. +//! `UPDATE_FACADE=1 cargo test -p craft -- integration::features` rewrites the checked-in table, and +//! first adds the optional dependency line and the `pub use` line of every member the facade lacks. use super::common; @@ -115,6 +116,46 @@ fn checked_in(manifest: &str) -> (usize, usize) { (start, end) } +/// Adds `craft-x = { workspace = true, optional = true }` to the facade manifest's `[dependencies]` and +/// `pub use craft_x as x;` to `src/lib.rs` for every member that has neither, leaving the hand-written lines alone. +fn add_missing_members(members: &[Member], manifest_path: &std::path::Path) { + let manifest = std::fs::read_to_string(manifest_path).unwrap(); + let have: toml::Table = manifest.parse().unwrap(); + let deps = have["dependencies"].as_table().unwrap(); + let missing: Vec<&Member> = members.iter().filter(|m| !deps.contains_key(&format!("craft-{}", m.dir))).collect(); + if !missing.is_empty() { + let at = manifest.find("\n[features]").expect("[features] section"); + let head = manifest[..at].trim_end(); + let mut text = head.to_owned(); + for m in &missing { + text += &format!("\ncraft-{} = {{ workspace = true, optional = true }}", m.dir); + } + text += "\n"; + text += &manifest[at..]; + std::fs::write(manifest_path, text).unwrap(); + } + + let lib_path = manifest_path.with_file_name("src/lib.rs"); + let lib = std::fs::read_to_string(&lib_path).unwrap(); + let mut lines: Vec = lib.lines().map(str::to_owned).collect(); + for m in members.iter().filter(|m| !m.always_on() && m.dir != "ui") { + let ident = m.dir.replace('-', "_"); + if lines.iter().any(|l| l.starts_with(&format!("pub use craft_{ident} as "))) { + continue; + } + let name_of = |l: &String| l.strip_prefix("pub use craft_").and_then(|r| r.split(' ').next()).map(str::to_owned); + let at = lines + .iter() + .position(|l| name_of(l).is_some_and(|n| n > ident)) + .or_else(|| lines.iter().position(|l| l == "pub use egui;")) + .expect("re-export block"); + let at = if lines[at - 1].starts_with("#[cfg(") { at - 1 } else { at }; + lines.insert(at, format!("pub use craft_{ident} as {ident};")); + lines.insert(at, format!("#[cfg(feature = \"{}\")]", m.dir)); + } + std::fs::write(&lib_path, lines.join("\n") + "\n").unwrap(); +} + #[test] fn features_table_matches_member_manifests() { let members = members(); @@ -123,6 +164,9 @@ fn features_table_matches_member_manifests() { let manifest = std::fs::read_to_string(&path).unwrap(); let (start, end) = checked_in(&manifest); if std::env::var_os("UPDATE_FACADE").is_some() { + add_missing_members(&members, &path); + let manifest = std::fs::read_to_string(&path).unwrap(); + let (start, end) = checked_in(&manifest); let mut text = manifest[..start].to_owned(); text += &want; text += &manifest[end..]; From 2b5de84828ebeeca2b46b13ade7df4bb530f4aba Mon Sep 17 00:00:00 2001 From: aiongg Date: Sat, 14 Nov 2026 05:05:04 +0000 Subject: [PATCH 05/15] Design lint: layer the env values, route egui access through the adapter, derive setters, token and relation checks in tests The gate's design-lint test finds nothing. Env value types (pane edge, column align, row pressed, in-bar), band fill and span live in the layer that uses them; the cursor image and inside label are read back by the higher layer. Hand setters become derived props, tests assert relations, and the remaining sites are listed exceptions with reasons. The shortcut chord chip's sample is built only for screen tests. --- crates/draw/src/ui/artboard/stories.rs | 4 +- crates/draw/src/ui/brush_presets/picker.rs | 2 +- crates/imaging/src/ui/select/stories.rs | 2 +- crates/layers/src/ui/filter/mod.rs | 2 +- crates/layers/src/ui/panel/drag.rs | 4 +- crates/layers/src/ui/panel/mod.rs | 1 + crates/menu/src/shortcuts/view/table.rs | 1 + crates/review/src/ui/comments/row.rs | 11 +-- crates/timeline/src/ui/preview.rs | 2 +- crates/timeline/src/ui/transport.rs | 2 +- crates/ui-canvas/src/canvas/mod.rs | 16 +--- crates/ui-canvas/src/canvas/tools.rs | 4 +- .../src/canvas_controls/brush/stories.rs | 2 +- crates/ui-contract/src/contract/body/hooks.rs | 2 +- .../src/contract/collection/columns.rs | 11 +-- .../src/contract/collection/props.rs | 17 +--- crates/ui-contract/src/contract/container.rs | 45 +-------- crates/ui-contract/src/contract/cx/context.rs | 2 +- crates/ui-contract/src/contract/ghost/art.rs | 10 +- .../ui-contract/src/contract/label/props.rs | 8 ++ crates/ui-contract/src/contract/label/step.rs | 5 +- .../src/contract/overlay/placement.rs | 1 + crates/ui-contract/src/contract/paint_ui.rs | 48 ++-------- crates/ui-contract/src/contract/run.rs | 2 +- crates/ui-contract/src/layout/body.rs | 8 ++ crates/ui-contract/src/primitives/draw.rs | 2 +- crates/ui-contract/src/primitives/kit.rs | 1 + crates/ui-contract/src/primitives/text.rs | 90 +----------------- .../src/primitives/text_adapter.rs | 64 ++++++++++++- crates/ui-contract/src/runtime/access.rs | 8 +- crates/ui-contract/src/runtime/cursor.rs | 16 +++- crates/ui-contract/src/runtime/drag.rs | 2 +- crates/ui-contract/src/runtime/egui/access.rs | 10 ++ crates/ui-contract/src/runtime/egui/areas.rs | 23 +++++ .../ui-contract/src/runtime/egui/fixture.rs | 15 --- crates/ui-contract/src/runtime/egui/focus.rs | 5 - crates/ui-contract/src/runtime/egui/input.rs | 15 +++ crates/ui-contract/src/runtime/env.rs | 17 ++-- crates/ui-contract/src/runtime/env/values.rs | 60 +++++++++++- crates/ui-contract/src/runtime/env/view.rs | 9 +- crates/ui-contract/src/runtime/focus.rs | 2 +- crates/ui-contract/src/runtime/inspect.rs | 9 +- crates/ui-contract/src/runtime/lazy.rs | 12 +-- crates/ui-contract/src/runtime/pointer.rs | 4 +- crates/ui-contract/src/runtime/replay.rs | 5 +- crates/ui-contract/src/style/mod.rs | 4 +- crates/ui-contract/src/style/span.rs | 92 +++++++++++++++++++ crates/ui-contract/src/style/state.rs | 5 + crates/ui-contract/src/style/surface.rs | 14 ++- crates/ui-contract/src/style/text_measure.rs | 2 +- .../src/testing/host_key_trials.rs | 10 +- crates/ui-contract/src/testing/pointer.rs | 6 +- crates/ui-contract/src/testing/relations.rs | 20 ++++ crates/ui-gallery/src/chrome/card.rs | 7 +- crates/ui-gallery/src/chrome/overview.rs | 2 + .../ui-gallery/src/foundations/edit_policy.rs | 6 +- crates/ui-panels/src/dialog/trials.rs | 11 ++- crates/ui-panels/src/docking/group.rs | 13 ++- crates/ui-panels/src/docking/iconic.rs | 11 +-- .../ui-panels/src/docking/iconic/stories.rs | 2 +- crates/ui-panels/src/docking/iconic/trials.rs | 7 +- crates/ui-panels/src/docking/root.rs | 10 +- .../ui-panels/src/rails/panel_rail/trials.rs | 5 +- .../patterns/form_dialogs/guides/trials.rs | 3 +- .../src/patterns/form_dialogs/preview.rs | 2 +- .../src/patterns/panels/palette.rs | 2 +- .../src/patterns/preferences/window.rs | 4 +- .../src/patterns/presets/browser.rs | 2 +- crates/ui-shell/src/shell/app_shell.rs | 13 +-- crates/ui-shell/src/shell/embed.rs | 12 ++- crates/ui-shell/src/shell/viewport_window.rs | 12 +-- crates/ui-widgets/src/bars/status.rs | 2 +- .../ui-widgets/src/display/inspect_overlay.rs | 42 +++------ crates/ui-widgets/src/list/row.rs | 13 +-- crates/ui-widgets/src/list/row/placement.rs | 4 +- crates/ui-widgets/src/table/view.rs | 2 +- crates/ui-widgets/src/text/alt_text.rs | 1 + crates/ui-widgets/src/value_drag/slider.rs | 6 +- crates/ui-widgets/tests/it/value_drag.rs | 2 +- design-lint.toml | 15 --- design/exceptions/craft-draw/crate.toml | 8 ++ design/exceptions/craft-timeline/crate.toml | 8 ++ design/exceptions/craft-ui-canvas/canvas.toml | 8 ++ .../exceptions/craft-ui-panels/docking.toml | 23 +++++ design/exceptions/craft-ui-panels/rails.toml | 8 ++ .../craft-ui-patterns/preferences.toml | 8 ++ design/exceptions/craft-ui-widgets/text.toml | 21 ----- 87 files changed, 579 insertions(+), 450 deletions(-) create mode 100644 crates/ui-contract/src/style/span.rs diff --git a/crates/draw/src/ui/artboard/stories.rs b/crates/draw/src/ui/artboard/stories.rs index 6cac751e1..9525e29ac 100644 --- a/crates/draw/src/ui/artboard/stories.rs +++ b/crates/draw/src/ui/artboard/stories.rs @@ -127,8 +127,8 @@ impl Boards { let page = |(index, item): (usize, &ArtboardItem)| { let page = PageFrame::new(item.rect.abs()).name(item.name.clone()).active(self.selected.contains(&index)); match item.background { - ArtboardBackground::White => page.fill(DataColor(Color32::WHITE)), - ArtboardBackground::Black => page.fill(DataColor(Color32::BLACK)), + ArtboardBackground::White => page.fill(DataColor(Color32::WHITE)), // design: allow[raw-colour/const](the artboard background is document data) + ArtboardBackground::Black => page.fill(DataColor(Color32::BLACK)), // design: allow[raw-colour/const](the artboard background is document data) ArtboardBackground::Custom(color) => page.fill(DataColor(Color32::from(color))), _ => page, } diff --git a/crates/draw/src/ui/brush_presets/picker.rs b/crates/draw/src/ui/brush_presets/picker.rs index d1e1e2ca5..dbd6fe5b3 100644 --- a/crates/draw/src/ui/brush_presets/picker.rs +++ b/crates/draw/src/ui/brush_presets/picker.rs @@ -324,7 +324,7 @@ impl<'a, K: Value + Eq + Hash> BrushPresetPicker<'a, K> { let next_search = Cell::new(before.search); let tool_picks: RefCell>> = RefCell::new(Vec::new()); let (mut diameter, mut hardness, mut tip) = (EditEvents::new(), EditEvents::new(), EditEvents::new()); - let browser_id = ui.make_persistent_id("browser"); + let browser_id = ui.scope_id().with("browser"); let has_app_rows = gear_rows.is_some(); let head = |ui: &mut Ui, _: &mut BodyCx<'_>| { Row::new().show(ui, |ui, _| { diff --git a/crates/imaging/src/ui/select/stories.rs b/crates/imaging/src/ui/select/stories.rs index 638f14668..79fd5e7c2 100644 --- a/crates/imaging/src/ui/select/stories.rs +++ b/crates/imaging/src/ui/select/stories.rs @@ -256,7 +256,7 @@ impl PictureEdges { fn normal(&self, p: Point) -> Vec2 { let d = |dx: f64, dy: f64| self.image.subject_distance(p.x + dx, p.y + dy); let g = Vec2::new(d(1.0, 0.0) - d(-1.0, 0.0), d(0.0, 1.0) - d(0.0, -1.0)); - if g.hypot() > 0.0 { g / g.hypot() } else { Vec2::new(0.0, -1.0) } + if g.hypot() > 0.0 { g / g.hypot() } else { Vec2::from((0.0, -1.0)) } } /// The point of the outline nearest `p`; `None` beyond the search's width or where the edge is weaker than its diff --git a/crates/layers/src/ui/filter/mod.rs b/crates/layers/src/ui/filter/mod.rs index c2abf9e28..09566dff0 100644 --- a/crates/layers/src/ui/filter/mod.rs +++ b/crates/layers/src/ui/filter/mod.rs @@ -669,7 +669,7 @@ impl<'a> LayerFilterBar<'a> { pub fn show(self, ui: &mut Ui) -> LayerFilterOutput { let Self { mut filter, blend_modes, focus_name, types: offered } = self; if offered.is_empty() { - return LayerFilterOutput { response: ui.allocate_response(egui::Vec2::ZERO, egui::Sense::hover()), changed: false, edit: None }; + return LayerFilterOutput { response: Row::new().show(ui, |_, _| {}).output, changed: false, edit: None }; } let words = Env::of(ui).words::(); let mut edit = None; diff --git a/crates/layers/src/ui/panel/drag.rs b/crates/layers/src/ui/panel/drag.rs index 694c4c247..4b41cfc73 100644 --- a/crates/layers/src/ui/panel/drag.rs +++ b/crates/layers/src/ui/panel/drag.rs @@ -208,11 +208,11 @@ pub(super) fn clip_cursor(tree: &T, above: &LayerRowKey, be return None; } let icon = if tree.info(upper).clipped { "clip_release" } else { "clip_below" }; - Some(Cursor::Painted(PaintedCursor::tool(IconId::new(icon), CLIP_HOTSPOT, None))) + Some(Cursor::Painted(PaintedCursor::tool(IconId::new(icon), egui::Vec2::from(CLIP_HOTSPOT), None))) } /// The tip of the clip cursors' arrow in their 24-unit icon box. -const CLIP_HOTSPOT: egui::Vec2 = egui::Vec2::new(15.0, 16.0); +const CLIP_HOTSPOT: [f32; 2] = [15.0, 16.0]; /// The reorder event of the list as the panel reports it: one `Set` per drop. pub(super) fn drop_event( diff --git a/crates/layers/src/ui/panel/mod.rs b/crates/layers/src/ui/panel/mod.rs index 2e51583a9..0d3826523 100644 --- a/crates/layers/src/ui/panel/mod.rs +++ b/crates/layers/src/ui/panel/mod.rs @@ -179,6 +179,7 @@ pub struct LayersPanel<'a, T: LayerTree> { /// What a reveal ([`LayersPanel::reveal`]) does with the closed groups that hold the layer. #[derive(Clone, Copy, Debug, PartialEq, Eq)] +#[non_exhaustive] pub enum Groups { /// They open ([`LayersEvent::Open`]) and the layer's own row scrolls into view. Open, diff --git a/crates/menu/src/shortcuts/view/table.rs b/crates/menu/src/shortcuts/view/table.rs index 3c0c87c1f..0f29e53bb 100644 --- a/crates/menu/src/shortcuts/view/table.rs +++ b/crates/menu/src/shortcuts/view/table.rs @@ -726,6 +726,7 @@ impl ChordChip { ChordChip { common: Common::new(), chord, pressed: false } } + #[cfg(feature = "screen-testing")] fn sample() -> Self { ChordChip::new("Ctrl+S".to_owned()).label("Save, Ctrl+S") } diff --git a/crates/review/src/ui/comments/row.rs b/crates/review/src/ui/comments/row.rs index 8ad9d88d5..bc8bcbc8f 100644 --- a/crates/review/src/ui/comments/row.rs +++ b/crates/review/src/ui/comments/row.rs @@ -127,7 +127,7 @@ trait Sink { pub(super) const MORE: PartKey = PartKey::new("more"); /// A card or a heading of the card collection. -#[derive(craft_ui::contract::Component)] +#[derive(craft_ui::contract::Component, craft_ui::contract::Props)] pub(crate) struct CommentRow<'r> { #[common] common: Common, @@ -138,7 +138,8 @@ pub(crate) struct CommentRow<'r> { now: i64, editing: Option<(usize, &'r str)>, reply: &'r str, - /// The activation key reached the card this pass: the reply box takes the focus. + /// The activation key reached the card this pass: its reply box takes the focus, when it shows one. + #[prop] focus_reply: bool, words: Option>, /// The heights the editor field and the reply field measured, for the paint of the same pass. @@ -190,12 +191,6 @@ impl<'r> CommentRow<'r> { self } - /// The activation key reached the card this pass: its reply box takes the focus, when it shows one. - pub(crate) fn focus_reply(mut self, on: bool) -> Self { - self.focus_reply = on; - self - } - /// The message being edited and its draft, and the reply draft. pub(crate) fn drafts(mut self, editing: Option<(usize, &'r str)>, reply: &'r str) -> Self { self.editing = editing; diff --git a/crates/timeline/src/ui/preview.rs b/crates/timeline/src/ui/preview.rs index f5c858f33..1cdf4c617 100644 --- a/crates/timeline/src/ui/preview.rs +++ b/crates/timeline/src/ui/preview.rs @@ -117,7 +117,7 @@ impl Component for FramePreview { let strip = line.map_or(0.0, |line| line.y); let area = Rect::from_min_max(rect.min, pos2(rect.max.x, (rect.max.y - strip).max(rect.min.y))); // The bars belong to the picture, as in a video player, so they are black in every theme. - ui.draw().data_fill(&PaintShape::Rect(area, CornerRadius::ZERO), DataColor::new(Color32::BLACK)); + ui.draw().data_fill(&PaintShape::Rect(area, CornerRadius::ZERO), DataColor::new(Color32::BLACK)); // design: allow[raw-colour/const](the picture's bars are black in every theme) let (target, uv) = frame_rect(area, size, self.fit); ui.content_painter(cx).picture(texture, target, uv, 0.0); if let (Some(run), Some(line)) = (run, line) { diff --git a/crates/timeline/src/ui/transport.rs b/crates/timeline/src/ui/transport.rs index 7710931ca..b8c8a457d 100644 --- a/crates/timeline/src/ui/transport.rs +++ b/crates/timeline/src/ui/transport.rs @@ -378,7 +378,7 @@ impl MediaControls { let mut slider = Slider::new(Bind::given(position), range).step(NUDGE).sizing(Sizing::FillWidth).enabled(playable).label(words.seek.clone()); if let Some((start, end)) = trim.filter(|_| playable) { - slider = slider.trim(start, end); + slider = slider.trim(start..=end); } let edit = slider.show(ui); seek = edit.events; diff --git a/crates/ui-canvas/src/canvas/mod.rs b/crates/ui-canvas/src/canvas/mod.rs index 994795ec9..b25bbb60c 100644 --- a/crates/ui-canvas/src/canvas/mod.rs +++ b/crates/ui-canvas/src/canvas/mod.rs @@ -187,7 +187,11 @@ pub struct Canvas<'a> { context_key: bool, /// The ease the app asked for from the view it drew ([`ease_from`](Self::ease_from)). ease: Option, - /// The app's tool moves the view with the pointer this pass ([`view_follows_pointer`](Self::view_follows_pointer)). + /// The app's tool moves the view with the pointer this pass (an image-moving crop slides the view by fractional + /// pointer distances under a frame that stays put): the shown view stays as given, not [`pixel_aligned`], so the + /// picture and the frame do not jitter by part of a pixel as the pointer moves. P-15: the tool host passes the + /// framework `CropTool`'s image mode. + #[prop(name = "view_follows_pointer")] follows_pointer: bool, } @@ -272,16 +276,6 @@ impl<'a> Canvas<'a> { self } - /// The app's tool moves the view with the pointer this pass (an image-moving crop slides the view by fractional - /// pointer distances under a frame that stays put): the shown view stays as given, not [`pixel_aligned`], so the - /// picture and the frame do not jitter by part of a pixel as the pointer moves. P-15: the tool host passes the - /// framework `CropTool`'s image mode. - #[must_use] - pub fn view_follows_pointer(mut self, follows: bool) -> Self { - self.follows_pointer = follows; - self - } - /// Leaves the view commands to the instance around the canvas that owns its view (a full-window dialog's): the /// canvas is no instance of them, so the chords reach that instance while the canvas has the focus. #[must_use] diff --git a/crates/ui-canvas/src/canvas/tools.rs b/crates/ui-canvas/src/canvas/tools.rs index 2f02c3010..26a30df5a 100644 --- a/crates/ui-canvas/src/canvas/tools.rs +++ b/crates/ui-canvas/src/canvas/tools.rs @@ -23,10 +23,10 @@ const ROTATE_STEP_DEG: f64 = 15.0; /// The room Fit Artboard on Screen leaves around the board, in points: at the sides, and above and below (the board's /// name sits above it). -const ARTBOARD_MARGIN: Vec2 = Vec2::new(30.0, 40.0); +const ARTBOARD_MARGIN: Vec2 = Vec2::new(30.0, 40.0); // design: allow[literal-size/vec2](view-fit room in screen points, not a look) /// The room Fit Layers on Screen leaves around the layers' bounds, in points. -const LAYERS_MARGIN: Vec2 = Vec2::new(20.0, 20.0); +const LAYERS_MARGIN: Vec2 = Vec2::new(20.0, 20.0); // design: allow[literal-size/vec2](view-fit room in screen points, not a look) /// Photoshop's default Screen Resolution (Preferences, Units & Rulers), in pixels per inch. const SCREEN_PPI: f64 = 72.0; diff --git a/crates/ui-canvas/src/canvas_controls/brush/stories.rs b/crates/ui-canvas/src/canvas_controls/brush/stories.rs index 2ebba918e..39bfb2ec9 100644 --- a/crates/ui-canvas/src/canvas_controls/brush/stories.rs +++ b/crates/ui-canvas/src/canvas_controls/brush/stories.rs @@ -124,7 +124,7 @@ fn tip_of(tip: StoryTip, dimensions: BrushDimensions, pointer: Option) -> let normal = (edge.core() + edge.reach()) / 2.0; match tip { StoryTip::Round => (BrushTip::round(dimensions.diameter, normal), TipPose::upright()), - StoryTip::ThinEllipse => (BrushTip::round(dimensions.diameter, normal), TipPose::new(Vec2::new(1.0, 0.0), Vec2::new(0.0, THIN))), + StoryTip::ThinEllipse => (BrushTip::round(dimensions.diameter, normal), TipPose::new(Vec2::from((1.0, 0.0)), Vec2::from((0.0, THIN)))), StoryTip::Star => { let share = (normal / full.max(f64::EPSILON)) as f32; let scaled = diff --git a/crates/ui-contract/src/contract/body/hooks.rs b/crates/ui-contract/src/contract/body/hooks.rs index d550ce2e1..9107da3c0 100644 --- a/crates/ui-contract/src/contract/body/hooks.rs +++ b/crates/ui-contract/src/contract/body/hooks.rs @@ -833,7 +833,7 @@ impl ShapeHooks for BodyHooks<'_> { let body_env = line_env.derive_local(|scoped| { let label_width = label_extra.x; self.scope_body(scoped, &props, id, BodyScope { room, real, sizing, content_column, scroll, label_width, beside: regions.beside }); - scoped.inside_label = inside; + scoped.inside_label = inside.map(|inside| inside as crate::runtime::env::Held); scoped.cell_fills = cell_fills; // A scrolling body shows its first child wherever the view is: the container has no first line there. scoped.first_line = (!real && scroll.is_none()).then_some(first_body); diff --git a/crates/ui-contract/src/contract/collection/columns.rs b/crates/ui-contract/src/contract/collection/columns.rs index 4293265d6..722974b55 100644 --- a/crates/ui-contract/src/contract/collection/columns.rs +++ b/crates/ui-contract/src/contract/collection/columns.rs @@ -1,5 +1,6 @@ //! A collection's columns: kinds, specs, alignment, toggle columns and the sort. +pub use crate::runtime::env::ColumnAlign; use crate::runtime::env::Label; use craft_behavior::{ColumnKey, ColumnWidth}; use craft_keymap::Chord; @@ -84,16 +85,6 @@ pub struct ColumnSpec { pub hideable: bool, } -/// Where a column's content sits. -#[derive(Clone, Copy, Debug, Default, PartialEq, Eq)] -pub enum ColumnAlign { - /// At the start edge. - #[default] - Start, - /// At the end edge. - End, -} - impl ColumnSpec { /// A content column with a header and a width; the other settings off. pub fn new(key: ColumnKey, header: impl Into