Simplify file import and export checks

crates/engine/src/cmd/fileinfo.rs

@@ -7,7 +7,7 @@ use serde_json::{Map, Value, json};
 use vectorcraft_doc::metadata::{MAX_RATING, iso8601};
 use vectorcraft_doc::{ColorMode, CopyrightStatus, DocMetadata, Document};
 
-use super::*;
+use super::{Result, Session, bad};
 
 const C: &str = "file.info";
 /// Longest text field, in characters.

crates/engine/src/cmd/fileio.rs

@@ -92,7 +92,7 @@ pub use svg::options_map as svg_options;
 #[cfg(not(target_arch = "wasm32"))]
 pub use vectorcraft_format::write_atomic;
 
-use super::*;
+use super::{CommandSpec, Result, Session, always, bad, cmd, has_doc, has_selection};
 use crate::EngineError;
 
 mod access;

crates/engine/src/cmd/fileio/access.rs

@@ -1,4 +1,6 @@
-use super::*;
+#[cfg(not(target_arch = "wasm32"))]
+use super::write_atomic;
+use super::{EngineError, Result, Session, Value, bad, json};
 
 // ---------- the file system (none on the web, where commands take and return bytes) ----------
 //

crates/engine/src/cmd/fileio/action_batch.rs

@@ -9,7 +9,9 @@ use serde_json::Value;
 #[cfg(not(target_arch = "wasm32"))]
 use serde_json::json;
 
-use super::super::*;
+use super::super::{Result, Session, bad};
+#[cfg(not(target_arch = "wasm32"))]
+use super::super::{bool_or, find_command, str_param};
 
 #[cfg(target_arch = "wasm32")]
 pub(super) fn action_batch(_: &mut Session, _: &Value) -> Result<Value> {

crates/engine/src/cmd/fileio/affinity/document.rs

@@ -1,7 +1,7 @@
 use super::layout::{master_instances, master_prefix, page_masters};
 use super::master_copies::{CopyCost, MAX_MASTER_COPIES, MasterPart, copy_cost};
 use super::nodes::rect_of;
-use super::*;
+use super::{Affine, Arc, Artboard, Blend, Builder, Document, Kind, Node, NodeKind, Result, af, err};
 
 impl Builder {
     pub(super) fn new(k: f64) -> Self {

crates/engine/src/cmd/fileio/affinity/import.rs

@@ -1,4 +1,4 @@
-use super::*;
+use super::{Builder, Cursor, Document, Result, err, raster_doc};
 
 /// What an Affinity file opened as.
 pub(in super::super) struct Imported {

crates/engine/src/cmd/fileio/affinity/layout.rs

@@ -1,5 +1,5 @@
 use super::nodes::MAX_DEPTH;
-use super::*;
+use super::{AfAlign, CharStyle, Cursor, Justify, Kind, Rect, TextKind, TextObject, VerticalAlign, af, shapes};
 
 /// The master page instances among `nodes` (also inside layers and groups): (master, first page,
 /// first master page, page count).

crates/engine/src/cmd/fileio/affinity/master_copies.rs

@@ -1,5 +1,5 @@
 use super::nodes::MAX_DEPTH;
-use super::*;
+use super::{Kind, af};
 
 /// What copying a subtree takes: its nodes, characters and table cells (`work`), and its pixels.
 #[derive(Clone, Copy, Debug, Default)]

crates/engine/src/cmd/fileio/affinity/nodes.rs

@@ -1,4 +1,4 @@
-use super::*;
+use super::{Affine, Arc, Blend, BlendMode, Builder, FillRule, Kind, LayerColor, Node, NodeKind, OpacityMask, Rect, af};
 
 /// Deepest node tree mapped (the reader bounds trees well below this).
 pub(super) const MAX_DEPTH: usize = 160;

crates/engine/src/cmd/fileio/affinity/paint.rs

@@ -1,7 +1,11 @@
 use super::layout::png;
 use super::nodes::affine;
 use super::text::Placement;
-use super::*;
+use super::{
+    AfKind, Affine, Appearance, AppearanceItem, Arc, BezPath, Builder, Cap, Color, Dash, Effect, FillLayer, Gradient, GradientGeom, GradientKind,
+    GradientPaint, GradientStop, ImageObject, Join, LineCap, LineJoin, NodeKind, Paint, PathData, Pixels, Point, StrokeAlign, StrokeLayer,
+    TextObject, Vec2, af, ap, json,
+};
 
 impl Builder {
     /// Drop shadows, inner shadows and outer glows as VectorCraft's Stylize effects. Affinity's

crates/engine/src/cmd/fileio/affinity/text.rs

@@ -1,6 +1,9 @@
 use super::layout::{align_lines, fit_lines, font_style, justify, line_gap, place_cell};
 use super::nodes::affine;
-use super::*;
+use super::{
+    Affine, Appearance, AppearanceItem, Arc, BezPath, Builder, CharStyle, FillRule, FirstBaseline, Node, NodeKind, Paint, PathData, Point, Rect,
+    TextKind, TextObject, TextRun, Vec2, VerticalAlign, af, ap, shapes,
+};
 
 /// Where text goes: a rigid placement (translation and rotation) and the scale that maps node
 /// space into it (applied to the frame's geometry, not the type), plus the type's own scale.

crates/engine/src/cmd/fileio/batch.rs

@@ -5,7 +5,7 @@ use std::sync::Arc;
 use serde_json::{Value, json};
 use vectorcraft_doc::Document;
 
-use super::super::*;
+use super::super::{Result, Session, bad, str_param};
 use crate::{DocState, EngineError};
 
 pub(super) fn batch(s: &mut Session, p: &Value) -> Result<Value> {

crates/engine/src/cmd/fileio/commands.rs

@@ -1,6 +1,6 @@
 use super::access::file_list;
 use super::formats::formats;
-use super::*;
+use super::{CommandSpec, action_batch, always, batch, cmd, export, has_doc, has_selection, load, pdfimport, save, screens};
 
 pub fn specs() -> Vec<CommandSpec> {
     vec![

crates/engine/src/cmd/fileio/dxf.rs

@@ -10,7 +10,7 @@ use vectorcraft_cad::{ColorDepth, DxfOptions, DxfVersion, Preserve, RasterFormat
 use vectorcraft_doc::{Document, Unit};
 use vectorcraft_geom::Rect;
 
-use super::super::*;
+use super::super::{CommandSpec, Result, Session, bad, cmd, has_doc};
 use super::{ArtboardPick, Encoded, FormatOption};
 
 const C: &str = "document.export";

crates/engine/src/cmd/fileio/dxfimport.rs

@@ -7,7 +7,7 @@ use serde_json::{Value, json};
 use vectorcraft_cad::ImportOptions;
 use vectorcraft_doc::{Document, Unit};
 
-use super::super::*;
+use super::super::{CommandSpec, Result, Session, always, bad, cmd};
 use super::{err, source};
 
 pub fn specs() -> Vec<CommandSpec> {

crates/engine/src/cmd/fileio/encode.rs

@@ -14,7 +14,7 @@ use vectorcraft_render::encode::quantize::{Dither, PaletteOptions, Reduction};
 use vectorcraft_render::encode::tiff::{ByteOrder, TiffOptions};
 use vectorcraft_render::encode::{RasterExportOptions, RasterFormat, bmp, psd, tga};
 
-use super::super::*;
+use super::super::{EngineError, Result, bad, color_value, parse_range};
 use super::Format;
 use super::imagemap::{self, MapKind};
 

crates/engine/src/cmd/fileio/eps.rs

@@ -13,7 +13,7 @@ use vectorcraft_eps::{EpsOptions, Level, Overprint, Preview, Raster};
 use vectorcraft_geom::{Point, Rect};
 
 use super::super::flatten::{FlattenOptions, flatten_document};
-use super::super::*;
+use super::super::{CommandSpec, EngineError, Result, Session, bad, cmd, has_doc, str_param};
 use super::{ArtboardPick, Encoded, FormatOption};
 
 const C: &str = "document.export";

crates/engine/src/cmd/fileio/export.rs

@@ -9,7 +9,7 @@ use vectorcraft_doc::{Document, Node, NodeId, NodeKind, SymbolBoxes};
 
 use crate::DocState;
 
-use super::super::*;
+use super::super::{Result, Session, bad, bool_or, edit, f64_or, str_param};
 use super::encode::single_artboard;
 use super::{
     ARTBOARD_PARAMS, Format, default_name, encode_all, encode_with_warnings, merge, with_black_output, writable, write_encoded, write_or_return,

crates/engine/src/cmd/fileio/export_names.rs

@@ -1,5 +1,5 @@
 use super::access::write_file;
-use super::*;
+use super::{Encoded, EngineError, Result, Session, Value, json};
 
 /// File-name parts for artboards `boards` of `doc`: the artboard's name with unsafe characters as
 /// `-`, `Artboard-N` when unnamed, and `-2`, `-3`… after a name already used (compared without

crates/engine/src/cmd/fileio/formats.rs

@@ -1,4 +1,4 @@
-use super::*;
+use super::{Result, Session, TEMPLATE_FORMATS, UNSUPPORTED, Unsupported, Value, bad, dxf, eps, json, metafile, native, pdf, svg, text, unsupported};
 
 /// One option a format's encoder reads from the export params.
 #[derive(Clone, Copy, Debug)]

crates/engine/src/cmd/fileio/legacy_ai.rs

@@ -37,7 +37,7 @@ use vectorcraft_color::BlendMode;
 use vectorcraft_doc::{Document, ImageBlob, ImageObject, Node, NodeKind};
 use vectorcraft_geom::{Anchor, FillRule, PathData, Point, Rect, SubPath};
 
-use super::super::*;
+use super::super::{Affine, EngineError, NodeId, Result, bad};
 use super::{ArtboardPick, Encoded, Format};
 
 /// Does `p` ask a save in `f` for a legacy `.ai` file of version 7 (`aiVersion: "7"`)? An unknown

crates/engine/src/cmd/fileio/load.rs

@@ -7,7 +7,7 @@ use vectorcraft_doc::{Document, ImageBlob, ImageObject, Node, NodeKind};
 use vectorcraft_geom::Affine;
 use vectorcraft_render::effects::pixel::LoadedTexture;
 
-use super::super::*;
+use super::super::{Result, Session, bad, bool_or, clipboard, parse_range, str_param};
 use super::pdfimport::LoadOptions;
 use super::{Format, SAVE_FORMATS, absolute_path, file_stamp, format, format_for_name, psdread, read_file};
 use crate::cmd::links::Resolved;

crates/engine/src/cmd/fileio/metafile.rs

@@ -7,7 +7,7 @@ use serde_json::Value;
 use vectorcraft_doc::Document;
 use vectorcraft_metafile::Kind;
 
-use super::super::*;
+use super::super::{Result, bad};
 use super::{ArtboardPick, Encoded, FormatOption};
 
 const C: &str = "document.export";

crates/engine/src/cmd/fileio/native.rs

@@ -12,7 +12,7 @@ use vectorcraft_color::cms;
 use vectorcraft_doc::Document;
 use vectorcraft_format::{PREVIEW_MAX, SaveOptions};
 
-use super::super::*;
+use super::super::{EngineError, Result, bad};
 use super::{Format, FormatOption};
 
 /// The options `document.save` and the native encoder read.

crates/engine/src/cmd/fileio/pdf.rs

@@ -11,7 +11,7 @@ use vectorcraft_doc::{Document, Node, NodeKind};
 use vectorcraft_pdf::{Overprint, PdfError, PdfOptions, PdfPreset, PdfSettings, Standard, THUMBNAIL_SIZE, Thumbnail};
 
 use super::super::flatten::{FlattenOptions, flatten_document, see_through_images};
-use super::super::*;
+use super::super::{CommandSpec, Result, Session, always, bad, bool_or, cmd, has_doc, str_param};
 use super::{ArtboardPick, FormatOption, write_or_return};
 use crate::EngineError;
 

crates/engine/src/cmd/fileio/pdfimport.rs

@@ -7,7 +7,7 @@ use vectorcraft_doc::{ColorMode, Document};
 use vectorcraft_pdf::{Choice, CropTo, ImportOptions, PdfError, TextAs};
 
 use super::super::colormgmt::Grays;
-use super::super::*;
+use super::super::{Result, Session, bad, f64_or, parse_range, str_param};
 use super::{err, source};
 
 /// The `document.open` options besides the file. The PDF ones (pages, box, password, text,

crates/engine/src/cmd/fileio/save.rs

@@ -12,7 +12,7 @@ use std::sync::Arc;
 use serde_json::{Map, Value, json};
 use vectorcraft_doc::Document;
 
-use super::super::*;
+use super::super::{CommandSpec, Result, Session, always, bad, bool_or, clock_date, cmd, date_param, has_doc, str_param};
 use super::{
     ARTBOARD_PARAMS, ArtboardPick, Encoded, Format, Loaded, encode_all, file_stem, format, format_for_name, load, read_file, with_compression_pref,
     write_encoded,

crates/engine/src/cmd/fileio/screens.rs

@@ -16,7 +16,7 @@ use serde_json::{Map, Value, json};
 use vectorcraft_doc::Document;
 use vectorcraft_geom::Rect;
 
-use super::super::*;
+use super::super::{NodeId, Result, Session, bad, str_param};
 use super::encode::single_artboard;
 use super::export::{export_crop, isolated, selected_artwork, without_artboards};
 use super::naming::{self, NameParts};

crates/engine/src/cmd/fileio/tests.rs

@@ -386,8 +386,8 @@ fn open_exts_cover_every_readable_format() {
 
 #[test]
 fn library_open_filters_list_library_formats_first() {
-    let filters: Vec<_> = library_open_filters("Swatch libraries", super::swatchlib::LIBRARY_EXTS).collect();
-    assert_eq!(filters[0], ("Swatch libraries", super::swatchlib::LIBRARY_EXTS));
+    let filters: Vec<_> = library_open_filters("Swatch libraries", crate::cmd::swatchlib::LIBRARY_EXTS).collect();
+    assert_eq!(filters[0], ("Swatch libraries", crate::cmd::swatchlib::LIBRARY_EXTS));
     assert!(filters[0].1.contains(&"ase"));
     assert_eq!(filters[1], ("All readable files", OPEN_EXTS));
 }

crates/engine/src/cmd/fileio/tests_metafile.rs

@@ -140,7 +140,7 @@ fn metafiles_open_and_place() {
     let placed = st.doc.layers[0].children().unwrap().last().unwrap().clone();
     assert_eq!(placed.name.as_deref(), Some("pic.emf"));
     assert!(matches!(placed.kind, NodeKind::Group { clip: true, .. }));
-    let ext = fileio::PLACE_EXTS;
+    let ext = crate::cmd::fileio::PLACE_EXTS;
     assert!(ext.contains(&"emf") && ext.contains(&"wmf") && OPEN_EXTS.contains(&"emf") && OPEN_EXTS.contains(&"wmf"));
 }
 

crates/engine/src/cmd/fileio/text.rs

@@ -8,7 +8,7 @@ use serde::Deserialize;
 use serde_json::Value;
 use vectorcraft_doc::{Document, Node, NodeId, NodeKind};
 
-use super::super::*;
+use super::super::{Result, bad};
 use super::FormatOption;
 
 const C: &str = "document.export";

crates/engine/src/cmd/pdfcmds.rs

@@ -8,7 +8,7 @@ use serde_json::{Value, json};
 use vectorcraft_pdf::{PdfPreset, builtin_preset, builtin_presets};
 
 use super::fileio::pdf::{find_preset, resolve};
-use super::*;
+use super::{CommandSpec, Result, Session, always, bad, bool_or, cmd, str_param, unique_name};
 
 /// The `format` of a PDF presets file, also its extension.
 pub const PRESET_FORMAT: &str = "vcpdfpresets";

crates/engine/src/cmd/place.rs

@@ -44,7 +44,7 @@ use vectorcraft_geom::{Affine, Point, Rect, shapes};
 use vectorcraft_pdf::CropTo;
 
 use super::fileio::{self, Format, RasterImage};
-use super::*;
+use super::{CommandSpec, Result, Session, always, bad, bool_or, cmd, finite_numbers, has_doc, id_param, str_param, unique_name};
 use crate::{EngineError, MAX_COORD};
 
 const PLACE: &str = "file.place";

crates/engine/src/cmd/place/document.rs

@@ -25,7 +25,7 @@ use vectorcraft_geom::{Affine, Rect};
 use vectorcraft_pdf::CropTo;
 
 use super::super::fileio;
-use super::super::*;
+use super::super::{EngineError, NodeId, Result, bad};
 
 /// The largest file placed (bytes).
 pub(crate) const MAX_FILE: usize = 256 << 20;

crates/engine/src/cmd/place/docx.rs

@@ -43,7 +43,7 @@ use vectorcraft_doc::text::Kashida;
 use vectorcraft_doc::{CharPosition, CharStyle, Justify, ParaDirection, ParaStyle, ScriptMetrics, TextRun};
 
 use super::text::{self, Story};
-use super::*;
+use super::{EngineError, Paint, Result, bad, fileio};
 use crate::cmd::fileio::zip::{self, Archive, ReadError};
 
 /// Word documents as `file.place` reports them (not a format `document.open` reads).

crates/engine/src/cmd/place/rtf.rs

@@ -31,7 +31,7 @@ use std::collections::HashMap;
 use vectorcraft_doc::{CharPosition, CharStyle, Justify, ParaDirection, ParaStyle, ScriptMetrics, TextRun};
 
 use super::text::{self, Story};
-use super::*;
+use super::{Paint, Result, bad, fileio};
 
 /// RTF files as `file.place` reports them (not a format `document.open` reads).
 pub(super) const FORMAT: fileio::Format = fileio::Format {

crates/engine/src/cmd/place/text.rs

@@ -3,7 +3,7 @@
 
 use serde_json::Value;
 
-use super::*;
+use super::{Point, Rect, Result, bad, bool_or, fileio, shapes, str_param};
 
 /// Text files as `file.place` reports them (not a format `document.open` reads).
 pub(super) const FORMAT: fileio::Format = fileio::Format {

crates/engine/src/cmd/webexport.rs

@@ -21,7 +21,7 @@ use vectorcraft_render::encode::quantize::{self, Dither, Indexed, PaletteOptions
 use vectorcraft_render::encode::web::{self, ColorSort};
 use vectorcraft_render::encode::{gif, jpeg, png};
 
-use super::*;
+use super::{CommandSpec, Result, Session, always, bad, bool_or, cmd, f64_or, has_doc, str_param, unique_name};
 
 const C: &str = "document.exportForWeb";