Merge main into fix/outline-stroke-keeps-effects-on-outline

crates/engine/src/cmd/appearance.rs

@@ -28,8 +28,11 @@ use vectorcraft_geom::Rect;
 use super::edit::{outermost, selected_roots};
 use super::opacitymask::percent;
 use super::paint::paint_from;
-use super::*;
 use super::{AppearanceAttrs, EyedropperAttrs, FillAttrs, StrokeAttrs};
+use super::{
+    CommandSpec, NodeId, Result, Session, bad, check_numbers, check_switches, cmd, has_doc, has_selection, id_param, ids_param, index, leaf_targets,
+    ok, paint_targets, str_param, switch_or, targets,
+};
 use crate::EngineError;
 
 pub fn specs() -> Vec<CommandSpec> {

crates/engine/src/cmd/assets.rs

@@ -8,7 +8,7 @@ use vectorcraft_doc::{ExportAsset, NodeId};
 
 use super::edit::{roots_of, selected_roots};
 use super::fileio::{SCREEN_SETTINGS_KEYS, check_screen_settings, export_crop, export_screens, store_screen_settings};
-use super::*;
+use super::{CommandSpec, EngineError, Result, Session, bad, bool_or, checked_ids_param, cmd, has_doc, ok, str_param};
 
 /// The longest asset name kept (characters).
 const MAX_NAME: usize = 255;

crates/engine/src/cmd/attributes.rs

@@ -10,7 +10,7 @@ use vectorcraft_geom::FillRule;
 
 use super::overprint::{AttributesInfo, apply_overprint, edit_counted, overprint_jobs};
 use super::path::paths_in;
-use super::*;
+use super::{CommandSpec, NodeId, Result, Session, bad, cmd, has_doc, str_param, targets};
 
 /// How many URLs the Attributes panel's recent list keeps.
 const RECENT_URLS: usize = 10;

crates/engine/src/cmd/brushlib.rs

@@ -22,7 +22,7 @@ use super::clipboard::resources::SwatchChoices;
 use super::patterncmds::add_pattern;
 use super::swatch::str_list;
 use super::swatchlib::{FileData, LibraryFile, LibraryInfo, stem};
-use super::*;
+use super::{CommandSpec, Result, Session, always, bad, bool_or, cmd, has_doc, str_param};
 
 /// The extension of saved brush libraries: native documents.
 pub const BRUSHES_EXT: &str = vectorcraft_format::EXTENSION;

crates/engine/src/cmd/brushsym.rs

@@ -18,7 +18,10 @@ use vectorcraft_geom::{Affine, Point, Vec2};
 use super::edit::{outermost, selected_roots};
 use super::pathops::{remove_each, separate};
 use super::swatch::{anchor, names_param};
-use super::*;
+use super::{
+    CommandSpec, Result, Session, bad, check_numbers, cmd, color_value, find_command, has_doc, has_selection, id_param, ids_param, number_or, ok,
+    str_param, switch_or,
+};
 use crate::EngineError;
 
 mod brushes;

crates/engine/src/cmd/brushsym/brushes.rs

@@ -1,4 +1,8 @@
-use super::*;
+use super::{
+    AppearanceItem, Arc, BTreeSet, Bristle, Brush, BrushKind, Color, Document, EngineError, Node, NodeId, NodeKind, Paint, Result, Session, Value,
+    anchor, bad, brush, check_numbers, find_command, id_param, ids_json, json, name_param, names_param, ok, roots, selection_art, set_unknown,
+    str_param,
+};
 
 // ---------- brushes ----------
 

crates/engine/src/cmd/brushsym/symbols.rs

@@ -1,4 +1,8 @@
-use super::*;
+use super::{
+    Affine, AppearanceItem, Arc, CURRENT_SYMBOL, Color, Document, EngineError, FillLayer, HALF, Node, NodeId, NodeKind, Paint, Point, Result,
+    SIZES_KEY, Session, Symbol, SymbolExportType, SymbolNineSlice, SymbolRegistration, Value, Vec2, bad, brush, color_value, ids_json, json,
+    name_param, number_or, ok, remove_each, roots, selection_art, separate, set_unknown, str_param, switch_or,
+};
 
 // ---------- symbols ----------
 

crates/engine/src/cmd/buildcmds.rs

@@ -27,7 +27,10 @@ use super::draw2::replace_with_pieces;
 use super::edit::{outermost, selected_roots};
 use super::paint::paint_from;
 use super::pathops::{Beside, shape_node};
-use super::*;
+use super::{
+    CommandSpec, EngineError, Result, Session, always, bad, check_numbers, cmd, color_value, f64_or, finite_numbers, has_doc, id_param, ids_param,
+    number_or, point_param, str_param, switch_or,
+};
 
 mod live_paint;
 mod shape_builder;

crates/engine/src/cmd/buildcmds/live_paint.rs

@@ -1,4 +1,8 @@
-use super::*;
+use super::{
+    Appearance, Arc, Beside, Document, EDGE_NAME, EngineError, FACE_NAME, GapOptions, GapSize, LIVE_PAINT_NAME, Node, NodeId, Paint, PathData, Point,
+    Rect, Result, SOURCES_NAME, Selection, Session, SubPath, Value, b, bad, build_children, edge_near, face_at, finite, id_param, ids_json,
+    is_live_paint, json, number_or, paint_from, po, point_param, repaint_from, replace_roots, root_ids, source_nodes, source_shapes, switch_or,
+};
 
 /// `options` as stored on a Live Paint group: none for the defaults.
 fn stored_gap_options(options: GapOptions) -> Option<Box<GapOptions>> {

crates/engine/src/cmd/buildcmds/shape_builder.rs

@@ -1,4 +1,8 @@
-use super::*;
+use super::{
+    Beside, BuilderMap, EngineError, FillRule, Node, NodeId, PathData, Point, Rect, Result, Session, SubPath, Touched, Value, b, bad, check_numbers,
+    f64_or, fill_param, finite, gap_param, ids_json, json, marquee_param, po, points_param, remnant, replace_roots, replace_with_pieces, root_ids,
+    shape_node, switch_or,
+};
 
 pub(super) fn sb_merge(s: &mut Session, p: &Value) -> Result<Value> {
     const C: &str = "shapeBuilder.merge";

crates/engine/src/cmd/buildcmds/trace.rs

@@ -1,4 +1,7 @@
-use super::*;
+use super::{
+    Appearance, AppearanceItem, Arc, Beside, Color, Document, EngineError, LineCap, LineJoin, LiveShape, Node, NodeId, NodeKind, Paint, Point,
+    Result, Session, StrokeLayer, TRACE_NAME, TraceView, Value, bad, fill_only, ids_json, json, root_ids, shape_node, str_param, switch_or, tr,
+};
 
 // ---------- Image Trace ----------
 

crates/engine/src/cmd/clipboard.rs

@@ -25,7 +25,7 @@ pub use flavours::{AI, BITMAP, EMF, EPS, FILE_HEAD, Flavour, PASTE_ORDER, PDF, P
 pub(crate) use resources::SwatchChoices;
 pub use resources::{ArtResources, art_resources};
 
-use super::*;
+use super::{CommandSpec, Result, Session, always, bad, cmd, f64_or, has_doc, point_param, str_param};
 use crate::DocState;
 
 pub fn specs() -> Vec<CommandSpec> {

crates/engine/src/cmd/clipboard/flavours.rs

@@ -12,7 +12,7 @@ use vectorcraft_geom::{Affine, Point};
 
 use super::super::fileio;
 use super::super::place::pt_per_px;
-use super::*;
+use super::{Clipboard, CommandSpec, Result, Session, always, bad, cmd, f64_or, has_doc, looks_like_svg, point_param, str_param};
 
 /// Plain text: a type-only copy's text, else the SVG markup (Include SVG Code).
 pub const TEXT: &str = "text/plain";

crates/engine/src/cmd/colorcmds.rs

@@ -18,7 +18,9 @@ use vectorcraft_doc::recolor::{ColorVisitor, Reach, map_links, recolor_node};
 use vectorcraft_doc::{Document, ImageBlob, Node, NodeId, NodeKind};
 
 use super::edit::selected_roots;
-use super::*;
+use super::{
+    CommandSpec, EngineError, Result, Session, always, bad, bool_or, cmd, color_value, f64_or, has_selection, ids_param, str_param, unique_name,
+};
 
 pub fn specs() -> Vec<CommandSpec> {
     vec![

crates/engine/src/cmd/colormgmt.rs

@@ -17,7 +17,9 @@ use vectorcraft_color::{Color, Paint};
 use vectorcraft_doc::ColorMode;
 use vectorcraft_render::proof;
 
-use super::*;
+#[cfg(not(target_arch = "wasm32"))]
+use super::EngineError;
+use super::{CommandSpec, Result, Session, always, bad, bool_or, cmd, color_value, has_doc, str_param, targets};
 
 /// `Document.unknown` key under which files before format v3 kept the assigned profiles (migrated
 /// to `Document::color_profiles` on load).

crates/engine/src/cmd/colortheme.rs

@@ -9,7 +9,7 @@ use vectorcraft_color::harmony::{Harmony, THEME_SIZE};
 use vectorcraft_color::recolor::ColorKey;
 use vectorcraft_tools::params::color_json;
 
-use super::*;
+use super::{CommandSpec, Result, Session, always, bad, cmd, color_value, has_doc, str_param};
 
 /// A saved colour theme ([`crate::Prefs::color_themes`]).
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]

crates/engine/src/cmd/create.rs

@@ -5,7 +5,10 @@ use vectorcraft_doc::{Appearance, CharStyle, LiveShape, Node, NodeKind, TextObje
 use vectorcraft_geom::{Affine, Anchor, AnchorKind, FillRule, PathData, Point, Rect, SubPath, shapes};
 
 use super::newart::NewArt;
-use super::*;
+use super::{
+    CommandSpec, NodeId, Result, Session, bad, bool_or, check_numbers, check_switches, cmd, color_value, f64_or, f64_req, finite_numbers, has_doc,
+    number_or, str_param, switch_or,
+};
 
 pub fn specs() -> Vec<CommandSpec> {
     vec![

crates/engine/src/cmd/css.rs

@@ -8,7 +8,7 @@ use vectorcraft_doc::NodeId;
 use vectorcraft_svg::{CssOptions, CssSheet, css_rules};
 
 use super::fileio::{default_name, encode_with_warnings, isolated, write_file};
-use super::*;
+use super::{CommandSpec, Result, Session, bad, cmd, has_doc, str_param, targets};
 
 pub fn specs() -> Vec<CommandSpec> {
     vec![

crates/engine/src/cmd/cut.rs

@@ -15,7 +15,7 @@ use vectorcraft_pathops::BoolOp;
 use super::draw2::{components, erase_outline, ids_json, replace_with_pieces};
 use super::edit::selected_roots;
 use super::pathops::{Beside, node_path};
-use super::*;
+use super::{CommandSpec, Result, Session, bad, cmd, finite_numbers, has_selection, point_param, str_param};
 
 pub fn specs() -> Vec<CommandSpec> {
     vec![

crates/engine/src/cmd/dimension.rs

@@ -1,5 +1,5 @@
 //! Linked dimensions: generated groups share the existing text/path render and export pipeline.
-use super::*;
+use super::{CommandSpec, EngineError, Result, Session, cmd, has_doc};
 use serde_json::{Value, json};
 use std::sync::Arc;
 use vectorcraft_color::{Color, Paint};

crates/engine/src/cmd/distortcmds.rs

@@ -14,7 +14,10 @@ use vectorcraft_tools::distort::perspective::{self as persp, PerspectiveGrid, Pl
 use vectorcraft_tools::distort::{PinSet, arap, collect_points, mesh_for, project_node, stroke_owner, warp_from_rest, warp_node_with};
 
 use super::edit::{duplicate_in, outermost, selected_roots};
-use super::*;
+use super::{
+    CommandSpec, Result, Session, bad, check_numbers, check_switches, cmd, f64_or, f64_req, finite_numbers, has_doc, has_selection, id_param,
+    ids_param, matrix_param, number_or, ok, point_indices, point_param, str_param, switch_or, targets,
+};
 use crate::EngineError;
 
 mod perspective;

crates/engine/src/cmd/distortcmds/perspective.rs

@@ -1,4 +1,8 @@
-use super::*;
+use super::{
+    Affine, Arc, Document, EngineError, Homography, NodeId, NodeKind, PerspectiveGrid, Plane, Point, Result, Session, Value, bad, check_numbers,
+    check_switches, collect_points, duplicate_in, finite_numbers, id_param, ids_param, json, matrix_param, number_or, ok, outermost, persp,
+    point_param, project_node, selected_roots, str_param, switch_or,
+};
 
 // ---------- perspective grid ----------
 

crates/engine/src/cmd/docinfo.rs

@@ -9,7 +9,7 @@ use vectorcraft_doc::{ColorMode, Document, Node, NodeId, NodeKind, RepeatKind, R
 use vectorcraft_geom::{Affine, Rect};
 use vectorcraft_text::embed::Embedding;
 
-use super::*;
+use super::{CommandSpec, Result, Session, bad, bool_or, cmd, has_doc, has_selection, str_param, targets};
 
 pub fn specs() -> Vec<CommandSpec> {
     vec![

crates/engine/src/cmd/docmenu.rs

@@ -12,7 +12,10 @@ use vectorcraft_geom::Vec2;
 use super::edit::selected_roots;
 use super::pathops::Beside;
 use super::select::{selectable_ids, walk_selectable};
-use super::*;
+use super::{
+    CommandSpec, EngineError, Point, Result, Session, bad, bool_or, checked_ids_param, cmd, f64_or, f64_req, has_doc, has_selection, id_param, ok,
+    str_param,
+};
 
 pub fn specs() -> Vec<CommandSpec> {
     vec![

crates/engine/src/cmd/docsetup.rs

@@ -7,7 +7,7 @@ use vectorcraft_doc::{Background, CharPosition, CharStyle, DocSetup, Document, E
 
 use super::flatten::{FlattenOptions, FlattenerPreset};
 
-use super::*;
+use super::{CommandSpec, Result, Session, bad, cmd, color_value, has_doc};
 
 const C: &str = "document.setup";
 

crates/engine/src/cmd/draw2.rs

@@ -17,7 +17,10 @@ use vectorcraft_tools::draw2::{eraser_area, eraser_tip};
 use super::create::{add_look, insert_look};
 use super::newart::NewArt;
 use super::pathops::{Beside, remove_each};
-use super::*;
+use super::{
+    CommandSpec, Result, Session, bad, check_numbers, cmd, f64_or, has_anchors, has_doc, has_selection, id_param, index, number_or, ok, str_param,
+    switch_or,
+};
 use crate::EngineError;
 
 mod anchors;

crates/engine/src/cmd/draw2/anchors.rs

@@ -1,5 +1,8 @@
 use super::common::{MAX_INPUT, path_kind, path_mut, point_entry, usize_opt, usize_req, within_input_bound};
-use super::*;
+use super::{
+    Anchor, BTreeSet, Beside, Color, Document, EngineError, Node, NodeId, NodeKind, Paint, PathData, Point, Result, Selection, Session, Value, Vec2,
+    add_look, bad, check_numbers, f64_or, id_param, json, number_or, ok, po, str_param, switch_or,
+};
 
 // ---------- Curvature ----------
 

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

@@ -2,7 +2,7 @@ use super::anchors::{convert_anchor, curvature, curvature_edit, remove_anchor, r
 use super::cut::{erase_region, erase_segments, knife, split};
 use super::freehand::{blob, freehand};
 use super::smooth::{join_scrub, smooth_region};
-use super::*;
+use super::{CommandSpec, cmd, has_anchors, has_doc, has_selection};
 
 pub fn specs() -> Vec<CommandSpec> {
     vec![

crates/engine/src/cmd/draw2/common.rs

@@ -1,4 +1,7 @@
-use super::*;
+use super::{
+    Appearance, Arc, Beside, Cap, Color, Document, EngineError, FillRule, Join, Node, NodeId, NodeKind, Paint, PathData, Point, PressureProfile,
+    Rect, Result, Selection, Session, SubPath, Value, Vec2, bad, index, json, po,
+};
 
 // ---------- helpers ----------
 

crates/engine/src/cmd/draw2/cut.rs

@@ -1,7 +1,10 @@
 use super::common::{
     dist_to_polyline, ids_json, path_mut, path_of, points_param, poly_bounds, replace_with_pieces, sibling_with, target_paths, usize_opt,
 };
-use super::*;
+use super::{
+    Anchor, AnchorKind, Beside, BezPath, BoolOp, Cap, EngineError, FillRule, Join, NodeId, ParamCurve, PathData, Point, Result, Session, SubPath,
+    Value, bad, eraser_area, eraser_tip, f64_or, fill_contains, id_param, json, number_or, po,
+};
 
 /// Split a filled path into connected pieces (each outer contour with its holes).
 pub(in super::super) fn components(pd: &PathData) -> Vec<PathData> {

crates/engine/src/cmd/draw2/freehand.rs

@@ -2,7 +2,10 @@ use super::common::{
     brush_region, path_kind, path_mut, path_of, points_param, poly_bounds, samples_param, stroke_paint, stroke_pressure, subpath_len, target_paths,
     within_input_bound,
 };
-use super::*;
+use super::{
+    Anchor, Appearance, BTreeSet, BoolOp, Color, EngineError, FillRule, NewArt, NodeId, NodeKind, Paint, PathData, Point, PressureProfile, Result,
+    Selection, Session, SimplifyOptions, SubPath, Value, bad, id_param, insert_look, json, number_or, po, remove_each, str_param, switch_or,
+};
 
 // ---------- Pencil / Paintbrush ----------
 

crates/engine/src/cmd/draw2/smooth.rs

@@ -1,5 +1,8 @@
 use super::common::{dist_to_polyline, ids_json, path_mut, path_of, points_param, poly_bounds, target_paths};
-use super::*;
+use super::{
+    Anchor, BezPath, CubicBez, NodeId, ParamCurve, ParamCurveNearest, PathData, Point, Result, Session, SimplifyOptions, SubPath, Value, json,
+    number_or, po,
+};
 
 // ---------- Smooth ----------
 

crates/engine/src/cmd/edit.rs

@@ -8,7 +8,11 @@ use vectorcraft_doc::{Document, Node, NodeId, RulerMode, Unit};
 use vectorcraft_geom::{Affine, Point, Vec2};
 
 use super::clipboard::SwatchChoices;
-use super::*;
+use super::{
+    CommandSpec, Result, Session, always, bad, bool_or, can_clear_history, can_redo, can_undo, checked_ids_param, cmd, f64_or, f64_req,
+    finite_numbers, has_clipboard, has_doc, has_selection, has_selection_or_artboard_tool, has_selection_or_guides, id_param, index, ok, point_param,
+    str_param,
+};
 use crate::{Clipboard, EngineError, inspect};
 
 /// Register editing commands, including document-to-document artwork drops and their parameter contracts.

crates/engine/src/cmd/effectcmd.rs

@@ -15,7 +15,7 @@ use vectorcraft_render::effects;
 use super::appearance::{ItemTarget, aligned, appearance_targets, index_param, item_target, item_target_at, shared_stack};
 use super::expand::has_seeded;
 use super::rasterfx;
-use super::*;
+use super::{CommandSpec, EngineError, NodeId, Result, Session, always, bad, cmd, fileio, has_doc, str_param};
 
 pub fn specs() -> Vec<CommandSpec> {
     vec![

crates/engine/src/cmd/expand.rs

@@ -22,7 +22,7 @@ use super::edit::selected_roots;
 use super::menucmds::{run_raw, squash};
 use super::object::as_clipping_path;
 use super::pathops::{assemble, node_path, outline_strokes, replace_leaves, styled_copy, with_transparency};
-use super::*;
+use super::{CommandSpec, EngineError, Result, Session, bad, bool_or, cmd, f64_or, has_selection, str_param};
 
 const C: &str = "object.expand";
 /// Expand Gradient To → Specify … Objects: the default and the most.

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/flatten.rs

@@ -38,7 +38,7 @@ use vectorcraft_render::effects;
 use super::edit::roots_of;
 use super::menucmds::{MAX_PIXELS, isolated_doc, unique_key};
 use super::pathops::{node_path, outline_strokes, outline_strokes_under, separate, shape_node};
-use super::*;
+use super::{CommandSpec, EngineError, Result, Session, always, bad, bool_or, cmd, has_doc, str_param, targets, unique_name};
 
 mod analysis;
 mod apply;

crates/engine/src/cmd/flatten/analysis.rs

@@ -1,4 +1,4 @@
-use super::*;
+use super::{Arc, BTreeSet, Document, Effect, ImageBlob, Knockout, Node, NodeKind, Rect, effects, outline_strokes};
 
 // ---------- plain art ----------
 

crates/engine/src/cmd/flatten/apply.rs

@@ -1,7 +1,11 @@
 use super::analysis::{Scratch, outlined_text, overlapping, reach};
 use super::compose::{Builder, CLEAR, Composer, Elem, Fill, Kind, WHITE};
 use super::options::FlattenOptions;
-use super::*;
+use super::{
+    Affine, Appearance, AppearanceItem, Arc, BlendMode, Color, ColorMode, Document, EngineError, FillLayer, FillRule, ImageBlob, ImageObject, Inks,
+    MAX_PIXELS, Node, NodeId, NodeKind, Paint, PathData, Rect, Result, effects, isolated_doc, outline_strokes_under, planes_cmyk, po, separate,
+    shape_node, shapes, unique_key,
+};
 
 // ---------- plan ----------
 

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

@@ -1,7 +1,7 @@
 use super::options::flatten;
 use super::presets::{presets_delete, presets_export, presets_import, presets_list, presets_save};
 use super::report::preview;
-use super::*;
+use super::{CommandSpec, always, cmd, has_doc};
 
 pub fn specs() -> Vec<CommandSpec> {
     vec![

crates/engine/src/cmd/flatten/compose.rs

@@ -1,5 +1,5 @@
 use super::analysis::{has_effects, masked, reach};
-use super::*;
+use super::{BlendMode, Color, FillRule, Knockout, Node, NodeKind, Paint, PathData, Rect, cmyk_planes, composite, effects, node_path, po, shapes};
 
 // ---------- the compositor ----------
 

crates/engine/src/cmd/flatten/options.rs

@@ -2,7 +2,7 @@ use super::analysis::draws_image;
 use super::apply::{apply, kept_work, plan};
 use super::presets::{FlattenerPreset, saved_preset};
 use super::report::target_roots;
-use super::*;
+use super::{BTreeSet, Deserialize, EngineError, Node, Result, Serialize, Session, Value, bad, json, str_param};
 
 /// Object → Flatten Transparency settings: a preset's, adjusted by the command's params.
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]

crates/engine/src/cmd/flatten/presets.rs

@@ -1,5 +1,5 @@
 use super::options::FlattenOptions;
-use super::*;
+use super::{Deserialize, Result, Serialize, Session, Value, bad, bool_or, json, str_param, unique_name};
 
 // ---------- presets ----------
 

crates/engine/src/cmd/flatten/report.rs

@@ -1,6 +1,9 @@
 use super::apply::{kept_work, opaque, plan, stroked};
 use super::options::FlattenOptions;
-use super::*;
+use super::{
+    Appearance, Color, Deserialize, Document, Node, NodeId, NodeKind, Paint, PathData, Rect, Result, Serialize, Session, Value, bad, isolated_doc,
+    json, roots_of, shape_node, str_param, targets,
+};
 
 /// The top-level objects among `ids` (or the selection), in paint order: layers stand for their
 /// contents; hidden and locked objects and clipping paths are left alone.

crates/engine/src/cmd/fontfiles.rs

@@ -12,7 +12,7 @@ use vectorcraft_doc::Document;
 use vectorcraft_text::{FontDb, FontMatch, WantedFont, WantedFonts};
 
 use super::findfiles::{self, Limits, Visitor};
-use super::*;
+use super::{CommandSpec, EngineError, Result, Session, always, bad, bool_or, cmd, has_doc};
 use crate::DocState;
 
 /// The most fonts listed, or looked for at once.

crates/engine/src/cmd/fonts.rs

@@ -11,7 +11,7 @@ use vectorcraft_doc::{AppearanceItem, Document, Node, NodeId, NodeKind, TextKind
 use vectorcraft_geom::Rect;
 
 use super::typecmd::refresh_bounds;
-use super::*;
+use super::{CommandSpec, Result, Session, always, bad, bool_or, cmd, has_doc, str_param};
 
 pub fn specs() -> Vec<CommandSpec> {
     vec![

crates/engine/src/cmd/freeform.rs

@@ -10,7 +10,7 @@ use vectorcraft_geom::{Affine, Rect};
 
 use super::appearance::{edit_items, edits_stroke, index_param, item_target};
 use super::gradient::{StopOwner, item_paint_bounds, run_paint_mut};
-use super::*;
+use super::{CommandSpec, Result, Session, bad, cmd, color_value, has_doc, index, number_or, point_indices, point_param, str_param, switch_or};
 
 pub fn specs() -> Vec<CommandSpec> {
     vec![

crates/engine/src/cmd/globaledit.rs

@@ -51,7 +51,7 @@ use vectorcraft_doc::{Appearance, AppearanceItem, Document, FillLayer, Node, Nod
 use vectorcraft_geom::{Affine, BezPath, PathData, Point, Rect, Shape};
 
 use super::wand::{fill_of, stroke_of};
-use super::*;
+use super::{CommandSpec, Result, Session, bad, bool_or, cmd, has_doc};
 
 const C: &str = "select.globalEdit";
 const OPTIONS: &str = "select.globalEditOptions";

crates/engine/src/cmd/gradient.rs

@@ -10,7 +10,10 @@ use vectorcraft_tools::params::color_json;
 use super::appearance::{ItemTarget, edit_items, edits_stroke, item_target};
 use super::edit::{outermost, selected_roots};
 use super::paint::swatch_solid;
-use super::*;
+use super::{
+    CommandSpec, NodeId, Result, Session, always, bad, bool_or, check_numbers, check_switches, cmd, color_value, f64_or, has_doc, index,
+    leaf_targets, point_param, str_param,
+};
 use crate::EngineError;
 
 pub fn specs() -> Vec<CommandSpec> {

crates/engine/src/cmd/graph.rs

@@ -17,7 +17,7 @@ use vectorcraft_doc::{
 use vectorcraft_geom::{Affine, BezPath, FillRule, PathData, Point, Rect, shapes};
 
 use super::typecmd::refresh_bounds;
-use super::*;
+use super::{CommandSpec, EngineError, Result, Session, bad, bool_or, cmd, f64_or, f64_req, has_doc, has_selection, id_param, ok, str_param};
 
 mod axis;
 mod columns;

crates/engine/src/cmd/graph/axis.rs

@@ -1,4 +1,4 @@
-use super::*;
+use super::Value;
 
 pub(super) const LABEL_SIZE: f64 = 9.0;
 

crates/engine/src/cmd/graph/columns.rs

@@ -4,7 +4,10 @@ use super::edit::{regenerate, spec_of, target};
 use super::generate::generate_with;
 use super::markers::{design_frame, fit_affine};
 use super::series::{picked_series, reselect_series};
-use super::*;
+use super::{
+    Affine, Arc, ColumnDesign, ColumnType, Document, FillRule, Fractions, GraphSpec, Node, NodeKind, Point, Rect, Result, Session, TextObject, Value,
+    bad, json, refresh_bounds, shapes,
+};
 
 /// Most objects a graph's column designs may add (each column, repeated copy and legend swatch draws a copy).
 const COLUMN_BUDGET: usize = 200_000;

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

@@ -3,7 +3,7 @@ use super::data::set_data;
 use super::designs::design;
 use super::edit::{create, set_type};
 use super::markers::set_marker;
-use super::*;
+use super::{CommandSpec, cmd, has_doc, has_selection};
 
 pub fn specs() -> Vec<CommandSpec> {
     vec![

crates/engine/src/cmd/graph/data.rs

@@ -1,6 +1,6 @@
 use super::edit::{regenerate, spec_of, target};
 use super::series::{switch_xy, transpose};
-use super::*;
+use super::{Document, EngineError, GraphKind, GraphSpec, NodeId, Result, Session, Value, bad, bool_or, json, str_param};
 
 // ---------- data ----------
 

crates/engine/src/cmd/graph/designs.rs

@@ -1,5 +1,5 @@
 use super::edit::regenerate;
-use super::*;
+use super::{Arc, Document, GraphDesign, GraphSpec, Result, Session, Value, bad, json, ok, str_param};
 
 /// The document's graph design names, in order.
 pub(super) fn design_names(d: &Document) -> Vec<String> {

crates/engine/src/cmd/graph/edit.rs

@@ -2,7 +2,10 @@ use super::axis::{MAX_TICK_MARKS, count_param, one_line};
 use super::data::apply_data;
 use super::generate::{children_bounds, generate};
 use super::series::{picked_series, reselect_series};
-use super::*;
+use super::{
+    Affine, Document, EngineError, GraphKind, GraphSpec, Node, NodeId, Rect, Result, Session, TickLength, Value, ValueAxisSide, bad, bool_or, f64_or,
+    f64_req, id_param, json, str_param,
+};
 
 /// Regenerate graph `id` from `spec` (adjusting the plot rect for any move/scale since the last
 /// generation, which is recorded in the spec's `placed` bounds).
@@ -74,6 +77,60 @@ pub(super) fn spec_of(s: &Session, id: NodeId) -> Result<GraphSpec> {
     s.doc()?.doc.node(id).and_then(|n| n.extras().graph.as_deref().cloned()).ok_or(EngineError::NoNode(id))
 }
 
+fn query_type_options(spec: &GraphSpec, count: usize, picked: &[usize]) -> Value {
+    // With series picked, the type and value axis they share, so the dialog's OK keeps them.
+    let kinds: Vec<GraphKind> = picked.iter().map(|i| spec.series_kind(*i)).collect();
+    let kind = kinds.first().copied().filter(|k| kinds.iter().all(|x| x == k)).unwrap_or(spec.kind);
+    // Series on both axes give no value axis (null), so OK leaves each where it is.
+    let sides: Vec<bool> = picked.iter().map(|i| spec.right_series.binary_search(i).is_ok()).collect();
+    let value_axis = match sides.first() {
+        None => Some(spec.value_axis.id()),
+        Some(r) if sides.iter().all(|x| x == r) => Some(if *r { "right" } else { "left" }),
+        Some(_) => None,
+    };
+    let mut fields = json!({
+        "type": kind.id(), "columnWidth": spec.column_width, "clusterWidth": spec.cluster_width, "legend": spec.legend,
+        "markPoints": spec.mark_points, "connectPoints": spec.connect_points, "edgeToEdge": spec.edge_to_edge, "ticks": spec.ticks,
+        "axisMin": spec.axis_min, "axisMax": spec.axis_max, "valueAxis": value_axis, "separateScales": spec.separate_scales,
+        "rightTicks": spec.right_ticks, "rightAxisMin": spec.right_axis_min, "rightAxisMax": spec.right_axis_max,
+        "tickLength": spec.tick_length.id(), "tickMarks": spec.tick_marks.clamp(1, MAX_TICK_MARKS), "rightTickLength": spec.right_tick_length.id(),
+        "rightTickMarks": spec.right_tick_marks.clamp(1, MAX_TICK_MARKS), "categoryTickLength": spec.category_tick_length.id(),
+        "categoryTickMarks": spec.category_tick_marks.clamp(1, MAX_TICK_MARKS), "ticksBetweenLabels": spec.ticks_between_labels,
+        "prefix": one_line(&spec.prefix), "suffix": one_line(&spec.suffix), "rightPrefix": one_line(&spec.right_prefix),
+        "rightSuffix": one_line(&spec.right_suffix), "dropShadow": spec.drop_shadow, "legendAcrossTop": spec.legend_across_top,
+        "firstRowInFront": spec.first_row_in_front, "firstColumnInFront": spec.first_column_in_front, "filledLines": spec.filled_lines,
+    });
+    // Only the options this graph's types use: overlap order for columns and bars, filled lines for lines.
+    let kinds: Vec<GraphKind> = (0..count.max(1)).map(|i| spec.series_kind(i)).collect();
+    let has = |ks: &[GraphKind]| kinds.iter().any(|k| ks.contains(k));
+    if let Some(o) = fields.as_object_mut() {
+        if !has(&[GraphKind::Column, GraphKind::StackedColumn, GraphKind::Bar, GraphKind::StackedBar]) {
+            o.remove("firstRowInFront");
+            o.remove("firstColumnInFront");
+        }
+        if !has(&[GraphKind::Line, GraphKind::Scatter, GraphKind::Radar]) {
+            o.remove("filledLines");
+        }
+    }
+    // Pie graphs: Legend, Position and Sort (their Legend stands for the legend checkbox).
+    if let Some(o) = fields.as_object_mut().filter(|_| spec.kind == GraphKind::Pie) {
+        o.remove("legend");
+        o.insert(
+            "pieLegend".into(),
+            json!(if !spec.legend {
+                "none"
+            } else if spec.pie_legend_in_wedges {
+                "wedges"
+            } else {
+                "standard"
+            }),
+        );
+        o.insert("piePosition".into(), json!(spec.pie_position.id()));
+        o.insert("pieSort".into(), json!(spec.pie_sort.id()));
+    }
+    fields
+}
+
 pub(super) fn set_type(s: &mut Session, p: &Value) -> Result<Value> {
     const C: &str = "graph.setType";
     let id = target(s, p, C)?;
@@ -127,57 +184,7 @@ pub(super) fn set_type(s: &mut Session, p: &Value) -> Result<Value> {
         "pieSort",
     ];
     if !keys.iter().any(|k| p.get(*k).is_some()) {
-        // With series picked, the type and value axis they share, so the dialog's OK keeps them.
-        let kinds: Vec<GraphKind> = picked.iter().map(|i| spec.series_kind(*i)).collect();
-        let kind = kinds.first().copied().filter(|k| kinds.iter().all(|x| x == k)).unwrap_or(spec.kind);
-        // Series on both axes give no value axis (null), so OK leaves each where it is.
-        let sides: Vec<bool> = picked.iter().map(|i| spec.right_series.binary_search(i).is_ok()).collect();
-        let value_axis = match sides.first() {
-            None => Some(spec.value_axis.id()),
-            Some(r) if sides.iter().all(|x| x == r) => Some(if *r { "right" } else { "left" }),
-            Some(_) => None,
-        };
-        let mut fields = json!({
-            "type": kind.id(), "columnWidth": spec.column_width, "clusterWidth": spec.cluster_width, "legend": spec.legend,
-            "markPoints": spec.mark_points, "connectPoints": spec.connect_points, "edgeToEdge": spec.edge_to_edge, "ticks": spec.ticks,
-            "axisMin": spec.axis_min, "axisMax": spec.axis_max, "valueAxis": value_axis, "separateScales": spec.separate_scales,
-            "rightTicks": spec.right_ticks, "rightAxisMin": spec.right_axis_min, "rightAxisMax": spec.right_axis_max,
-            "tickLength": spec.tick_length.id(), "tickMarks": spec.tick_marks.clamp(1, MAX_TICK_MARKS), "rightTickLength": spec.right_tick_length.id(),
-            "rightTickMarks": spec.right_tick_marks.clamp(1, MAX_TICK_MARKS), "categoryTickLength": spec.category_tick_length.id(),
-            "categoryTickMarks": spec.category_tick_marks.clamp(1, MAX_TICK_MARKS), "ticksBetweenLabels": spec.ticks_between_labels,
-            "prefix": one_line(&spec.prefix), "suffix": one_line(&spec.suffix), "rightPrefix": one_line(&spec.right_prefix),
-            "rightSuffix": one_line(&spec.right_suffix), "dropShadow": spec.drop_shadow, "legendAcrossTop": spec.legend_across_top,
-            "firstRowInFront": spec.first_row_in_front, "firstColumnInFront": spec.first_column_in_front, "filledLines": spec.filled_lines,
-        });
-        // Only the options this graph's types use: overlap order for columns and bars, filled lines for lines.
-        let kinds: Vec<GraphKind> = (0..count.max(1)).map(|i| spec.series_kind(i)).collect();
-        let has = |ks: &[GraphKind]| kinds.iter().any(|k| ks.contains(k));
-        if let Some(o) = fields.as_object_mut() {
-            if !has(&[GraphKind::Column, GraphKind::StackedColumn, GraphKind::Bar, GraphKind::StackedBar]) {
-                o.remove("firstRowInFront");
-                o.remove("firstColumnInFront");
-            }
-            if !has(&[GraphKind::Line, GraphKind::Scatter, GraphKind::Radar]) {
-                o.remove("filledLines");
-            }
-        }
-        // Pie graphs: Legend, Position and Sort (their Legend stands for the legend checkbox).
-        if let Some(o) = fields.as_object_mut().filter(|_| spec.kind == GraphKind::Pie) {
-            o.remove("legend");
-            o.insert(
-                "pieLegend".into(),
-                json!(if !spec.legend {
-                    "none"
-                } else if spec.pie_legend_in_wedges {
-                    "wedges"
-                } else {
-                    "standard"
-                }),
-            );
-            o.insert("piePosition".into(), json!(spec.pie_position.id()));
-            o.insert("pieSort".into(), json!(spec.pie_sort.id()));
-        }
-        return Ok(fields);
+        return Ok(query_type_options(&spec, count, &picked));
     }
     // Series picked with Group Selection stay selected through the regeneration (their groups are new nodes).
     let reselect: Vec<u32> = if p.get("seriesIndexes").is_none() { picked.iter().filter_map(|i| u32::try_from(*i).ok()).collect() } else { vec![] };

crates/engine/src/cmd/graph/labels.rs

@@ -2,7 +2,10 @@ use super::axis::LABEL_SIZE;
 use super::columns::{Allowance, ColumnArt};
 use super::markers::fit_design;
 use super::series::{default_series_paint, series_marks};
-use super::*;
+use super::{
+    Affine, Appearance, Arc, BezPath, CharStyle, Color, Document, GraphSpec, Justify, Node, NodeId, NodeKind, Paint, PathData, Point, Rect,
+    TextObject, refresh_bounds, shapes,
+};
 
 pub(super) struct Gen<'a> {
     pub(super) d: &'a mut Document,

crates/engine/src/cmd/graph/markers.rs

@@ -1,7 +1,7 @@
 use super::designs::design_names;
 use super::edit::{regenerate, spec_of, target};
 use super::series::{picked_series, reselect_series};
-use super::*;
+use super::{Affine, Arc, Document, GraphSpec, Node, NodeKind, Rect, Result, Session, Value, bad, json};
 
 /// Most objects a graph's marker designs may add (each data point and legend swatch draws a copy of its design).
 pub(super) const MARKER_BUDGET: usize = 200_000;

crates/engine/src/cmd/graph/series.rs

@@ -1,5 +1,5 @@
 use super::labels::{Role, label_style};
-use super::*;
+use super::{CharStyle, Color, Document, GraphKind, GraphSpec, HashMap, Node, NodeId, NodeKind, Paint, Result, Session, Value, bad};
 
 // ---------- generation ----------
 

crates/engine/src/cmd/halftone.rs

@@ -19,7 +19,7 @@ use vectorcraft_pathops::BoolOp;
 
 use super::edit::selected_roots;
 use super::menucmds::isolated_doc;
-use super::*;
+use super::{CommandSpec, EngineError, Result, Session, bad, bool_or, cmd, color_value, f64_or, has_selection, str_param};
 
 pub fn specs() -> Vec<CommandSpec> {
     vec![cmd!(

crates/engine/src/cmd/help.rs

@@ -3,7 +3,7 @@
 
 use serde_json::{Value, json};
 
-use super::*;
+use super::{CommandSpec, Result, always, cmd};
 
 /// The app's id on getartcraft.com and GitHub.
 pub const APP_ID: &str = "vectorcraft";
@@ -39,6 +39,7 @@ fn url(u: String) -> Result<Value> {
 #[cfg(test)]
 mod tests {
     use super::*;
+    use crate::Session;
 
     #[test]
     fn links() {

crates/engine/src/cmd/importmatches.rs

@@ -8,7 +8,7 @@ use std::collections::HashMap;
 use serde::{Deserialize, Serialize};
 use serde_json::{Value, json};
 
-use super::*;
+use super::{CommandSpec, Result, Session, always, bad, cmd, str_param};
 use crate::Prefs;
 
 /// The most matches kept.

crates/engine/src/cmd/inline.rs

@@ -7,7 +7,7 @@ use vectorcraft_doc::{Document, InlineArt, NodeId, NodeKind, TextRun};
 use vectorcraft_text::edit;
 
 use super::typecmd::refresh_bounds;
-use super::*;
+use super::{CommandSpec, EngineError, Result, Session, bad, cmd, has_doc, id_param, str_param};
 
 pub fn specs() -> Vec<CommandSpec> {
     vec![cmd!(

crates/engine/src/cmd/interactivity.rs

@@ -8,7 +8,7 @@ use serde_json::{Value, json};
 use vectorcraft_doc::{Document, MAX_SVG_SCRIPTS, NodeId, SVG_EVENTS};
 
 use super::overprint::edit_counted;
-use super::*;
+use super::{CommandSpec, Result, Session, bad, cmd, has_doc, str_param, targets};
 
 pub fn specs() -> Vec<CommandSpec> {
     vec![

crates/engine/src/cmd/intertwine.rs

@@ -26,7 +26,7 @@ use vectorcraft_tools::intertwine::{Face, drawn_order, face_at, faces, faces_in,
 
 use super::edit::selected_roots;
 use super::pathops::Beside;
-use super::*;
+use super::{CommandSpec, EngineError, Result, Session, bad, checked_id, checked_ids_param, cmd, has_selection, point_param, str_param};
 
 pub fn specs() -> Vec<CommandSpec> {
     vec![

crates/engine/src/cmd/layer.rs

@@ -13,7 +13,10 @@ use serde_json::{Value, json};
 use vectorcraft_doc::{Artboard, Document, LAYER_COLORS, LayerColor, Node, NodeId, NodeKind, Scaling};
 use vectorcraft_geom::{Affine, Rect};
 
-use super::*;
+use super::{
+    CommandSpec, Result, Session, bad, bool_or, check_numbers, check_switches, checked_id, checked_ids_param, cmd, color_value, f64_or, has_doc,
+    has_selection, id_param, ids_param, index, ok, str_param,
+};
 use crate::EngineError;
 
 /// Most rows one panel command takes (ids are untrusted input).

crates/engine/src/cmd/layerpanel.rs

@@ -10,7 +10,7 @@ use serde_json::{Value, json};
 use vectorcraft_doc::{Document, Node, NodeId, NodeKind};
 
 use super::layer::{NewLayers, row_roots, rows_param};
-use super::*;
+use super::{CommandSpec, Result, Session, bad, bool_or, checked_id, cmd, has_doc, id_param, ok};
 use crate::EngineError;
 
 pub fn specs() -> Vec<CommandSpec> {

crates/engine/src/cmd/library.rs

@@ -15,7 +15,7 @@ use serde_json::{Map, Value, json};
 use vectorcraft_color::{Color, Paint};
 use vectorcraft_doc::TextStyleDef;
 
-use super::*;
+use super::{CommandSpec, EngineError, Result, Session, always, bad, cmd, color_value, has_doc, ids_param, index, ok, point_param, str_param};
 use crate::Clipboard;
 
 /// The extension of a library file.

crates/engine/src/cmd/linkfiles.rs

@@ -13,7 +13,7 @@ use serde_json::{Value, json};
 use vectorcraft_doc::NodeKind;
 
 use super::findfiles::{self, Limits, Visitor};
-use super::*;
+use super::{CommandSpec, EngineError, NodeId, Result, Session, always, bad, bool_or, checked_ids_param, cmd};
 
 /// The most linked files one search looks for.
 const MAX_LINKS: usize = 1_000;