From abc39685b1feb88697b35803bd252e1683186f7c Mon Sep 17 00:00:00 2001 From: rvmzym5xv8-star Date: Sun, 25 Oct 2026 02:30:04 +0000 Subject: [PATCH] Parameters: name the limit an out-of-range number or over-long expression broke (#5906) Part of #4712. Co-authored-by: Claude Opus 5.5 --- crates/engine/src/cmd/features.rs | 6 +++--- crates/engine/src/cmd/sheet.rs | 4 ++-- crates/engine/src/cmd/sketch.rs | 4 ++-- crates/engine/src/cmd/sketch_modify.rs | 4 ++-- crates/engine/src/params.rs | 12 +++++++++++- crates/engine/src/schema/tests.rs | 7 +++++++ crates/engine/src/schema/types.rs | 3 ++- 7 files changed, 29 insertions(+), 11 deletions(-) diff --git a/crates/engine/src/cmd/features.rs b/crates/engine/src/cmd/features.rs index 1a0214c73..8b4da9201 100644 --- a/crates/engine/src/cmd/features.rs +++ b/crates/engine/src/cmd/features.rs @@ -10,7 +10,7 @@ use solidcraft_doc::{Dir, FacePick, Position}; use solidcraft_geom::Vec3; use super::{CommandSpec, not_in_sketch}; -use crate::params::{bad, bool_, expr, req_expr, str_, string_list, vec2, vec3}; +use crate::params::{bad, bool_, expr, expr_problem, req_expr, str_, string_list, vec2, vec3}; use crate::schema::features::{BoxParams, ExtrudeParams, FeatureResult}; use crate::schema::{TypedContract, output_schema_for}; use crate::{EngineError, Result, Session}; @@ -2222,7 +2222,7 @@ fn hole_reference_params(s: &Session, p: &Value, cmd: &str) -> Result Result<(SweepO let scale = match p.get("scale") { None | Some(Value::Null) => None, Some(_) => { - let k = expr(p, "scale").ok_or_else(|| bad(cmd, "`scale` must be a number or an expression"))?; + let k = req_expr(cmd, p, "scale")?; let v = s.doc.eval(&k, Kind::Unitless).map_err(|e| bad(cmd, format!("scale: {e}")))?; let range = solidcraft_kernel::SweepControl::MIN_SCALE..=solidcraft_kernel::SweepControl::MAX_SCALE; if !(v.is_finite() && range.contains(&v)) { diff --git a/crates/engine/src/cmd/sheet.rs b/crates/engine/src/cmd/sheet.rs index 071beb7d2..1388eddee 100644 --- a/crates/engine/src/cmd/sheet.rs +++ b/crates/engine/src/cmd/sheet.rs @@ -11,7 +11,7 @@ use solidcraft_geom::{Aabb2, Ring, Vec2, Vec3}; use super::CommandSpec; use super::features::{add_feature, check_expr, feature_sketch, profiles, sketch_id}; -use crate::params::{bad, bool_, expr, req_expr, str_, string_list, vec3}; +use crate::params::{bad, bool_, expr, expr_problem, req_expr, str_, string_list, vec3}; use crate::{EngineError, Result, Session}; pub static COMMANDS: &[CommandSpec] = &[ @@ -118,7 +118,7 @@ fn flange_edges(s: &Session, p: &Value, cmd: &str) -> Result> { if o.get(k).is_none_or(Value::is_null) { return Ok(None); } - let e = expr(v, k).ok_or_else(|| bad(cmd, format!("edges[{i}]: `{k}` must be a number or an expression")))?; + let e = expr(v, k).ok_or_else(|| bad(cmd, format!("edges[{i}]: `{k}` {}", expr_problem(v.get(k)))))?; check_expr(s, &e, kind, cmd, &format!("edges[{i}].{k}"))?; Ok(Some(e)) }; diff --git a/crates/engine/src/cmd/sketch.rs b/crates/engine/src/cmd/sketch.rs index ad6a9bc39..3c8401fc2 100644 --- a/crates/engine/src/cmd/sketch.rs +++ b/crates/engine/src/cmd/sketch.rs @@ -6,7 +6,7 @@ use solidcraft_geom::{Plane, Vec2, Vec3}; use solidcraft_sketch::{Analysis, Budget, ConstraintKind, CurveKind, Hold, PointExprs, Sketch, SolveReport, solve, solve_with}; use super::{CommandSpec, in_sketch}; -use crate::params::{bad, bool_, expr, num, req_vec2, str_, string_list, vec2, vec3}; +use crate::params::{bad, bool_, expr, num, req_expr, req_vec2, str_, string_list, vec2, vec3}; use crate::{EngineError, Result, Session, SketchEntry}; #[path = "sketch_dimensioned.rs"] @@ -1122,7 +1122,7 @@ fn rect_two_point(s: &mut Session, p: &Value) -> Result { fn rect_rounded(s: &mut Session, p: &Value) -> Result { let cmd = "sketch.rectangle.rounded"; let (a, b) = (req_vec2(cmd, p, "p0")?, req_vec2(cmd, p, "p1")?); - let r_expr = expr(p, "radius").ok_or_else(|| bad(cmd, "`radius` must be a number or an expression"))?; + let r_expr = req_expr(cmd, p, "radius")?; let r = s.doc.eval(&r_expr, Kind::Length).map_err(|e| bad(cmd, format!("radius: {e}")))?; if !(r > 1e-9 && r < 1e8) { return Err(bad(cmd, "radius must be positive")); diff --git a/crates/engine/src/cmd/sketch_modify.rs b/crates/engine/src/cmd/sketch_modify.rs index 7a8458a6f..c26fa5dfd 100644 --- a/crates/engine/src/cmd/sketch_modify.rs +++ b/crates/engine/src/cmd/sketch_modify.rs @@ -10,7 +10,7 @@ use solidcraft_sketch::{ConstraintKind, Curve, CurveKind, Shape, Sketch, interse use super::sketch::{add_c, edit, ids_of, solve_current}; use super::{CommandSpec, in_sketch}; -use crate::params::{bad, bool_, expr, num, req_vec2, str_, string_list, vec2, vec2_list}; +use crate::params::{bad, bool_, expr, num, req_expr, req_vec2, str_, string_list, vec2, vec2_list}; use crate::{Result, Session}; #[path = "sketch_pattern.rs"] @@ -1473,7 +1473,7 @@ fn cut_corner( fn fillet(s: &mut Session, p: &Value) -> Result { let cmd = "sketch.fillet"; - let r_expr = expr(p, "radius").ok_or_else(|| bad(cmd, "`radius` must be a number or an expression"))?; + let r_expr = req_expr(cmd, p, "radius")?; // Several corners at once (`points`), each like a single `point`. let corners: Vec = match p.get("points").and_then(Value::as_array) { Some(a) if !a.is_empty() && a.len() <= 500 => a.iter().map(|q| json!({ "point": q })).collect(), diff --git a/crates/engine/src/params.rs b/crates/engine/src/params.rs index 54a50f353..4960fc746 100644 --- a/crates/engine/src/params.rs +++ b/crates/engine/src/params.rs @@ -73,8 +73,18 @@ pub fn expr(p: &Value, k: &str) -> Option { } } +/// Why `v` isn't an expression parameter, for the message: a number out of range or a text too +/// long says so, rather than that it isn't a number or an expression at all. +pub fn expr_problem(v: Option<&Value>) -> &'static str { + match v { + Some(Value::Number(n)) if n.as_f64().is_some_and(f64::is_finite) => "must be a number between -1e9 and 1e9", + Some(Value::String(s)) if s.len() > 4096 => "must be an expression of at most 4096 characters", + _ => "must be a number or an expression", + } +} + pub fn req_expr(cmd: &str, p: &Value, k: &str) -> Result { - expr(p, k).ok_or_else(|| bad(cmd, format!("`{k}` must be a number or an expression"))) + expr(p, k).ok_or_else(|| bad(cmd, format!("`{k}` {}", expr_problem(p.get(k))))) } pub fn string_list(p: &Value, k: &str) -> Vec { diff --git a/crates/engine/src/schema/tests.rs b/crates/engine/src/schema/tests.rs index aa5ef6aea..8f193b312 100644 --- a/crates/engine/src/schema/tests.rs +++ b/crates/engine/src/schema/tests.rs @@ -147,6 +147,13 @@ fn shape_problems_are_issues() { let c = box_contract(); assert_eq!(messages(&c.check(&json!({"width": 5, "height": 5}))), vec!["`length` is required"]); assert_eq!(messages(&c.check(&json!({"length": true, "width": 5, "height": 5}))), vec!["`length` must be a number or an expression"]); + // A number out of range or an over-long expression says which limit it broke (#4712). + assert_eq!(messages(&c.check(&json!({"length": 1e9, "width": 5, "height": 5}))), vec!["`length` must be a number between -1e9 and 1e9"]); + assert_eq!(messages(&c.check(&json!({"length": -2e12, "width": 5, "height": 5}))), vec!["`length` must be a number between -1e9 and 1e9"]); + assert_eq!( + messages(&c.check(&json!({"length": "1+".repeat(2049) + "1", "width": 5, "height": 5}))), + vec!["`length` must be an expression of at most 4096 characters"] + ); assert_eq!( messages(&c.check(&json!({"length": 5, "width": 5, "height": 5, "corner": null}))), vec!["`corner` must be a point [x, y, z] of numbers or length expressions"] diff --git a/crates/engine/src/schema/types.rs b/crates/engine/src/schema/types.rs index 6cc26ba6d..1aa122ac0 100644 --- a/crates/engine/src/schema/types.rs +++ b/crates/engine/src/schema/types.rs @@ -61,7 +61,8 @@ macro_rules! expr_type { impl<'de> Deserialize<'de> for $name { fn deserialize>(d: D) -> Result { - params::expr(&wrap(Value::deserialize(d)?), "v").map($name).ok_or_else(|| D::Error::custom("must be a number or an expression")) + let v = wrap(Value::deserialize(d)?); + params::expr(&v, "v").map($name).ok_or_else(|| D::Error::custom(params::expr_problem(v.get("v")))) } }