Generate angle suffixes in the frontend

Signed-off-by: Nick Cameron <nrc@ncameron.org>

Author: nrc

package-lock.json

@@ -231,10 +231,9 @@ impl Program {
     pub fn change_default_units(
         &self,
         length_units: Option<execution::types::UnitLen>,
-        angle_units: Option<execution::types::UnitAngle>,
     ) -> Result<Self, KclError> {
         Ok(Self {
-            ast: self.ast.change_default_units(length_units, angle_units)?,
+            ast: self.ast.change_default_units(length_units)?,
             original_file_contents: self.original_file_contents.clone(),
         })
     }

rust/kcl-lib/src/lib.rs

@@ -28,7 +28,7 @@ use crate::{
     errors::KclError,
     execution::{
         annotations,
-        types::{ArrayLen, UnitAngle, UnitLen},
+        types::{ArrayLen, UnitLen},
         KclValue, Metadata, TagIdentifier,
     },
     parsing::{ast::digest::Digest, token::NumericSuffix, PIPE_OPERATOR},
@@ -360,7 +360,6 @@ impl Node<Program> {
     pub fn change_default_units(
         &self,
         length_units: Option<UnitLen>,
-        angle_units: Option<UnitAngle>,
     ) -> Result<Self, KclError> {
         let mut new_program = self.clone();
         let mut found = false;
@@ -372,13 +371,6 @@ impl Node<Program> {
                         Expr::Name(Box::new(Name::new(&len.to_string()))),
                     );
                 }
-                if let Some(angle) = angle_units {
-                    node.inner.add_or_update(
-                        annotations::SETTINGS_UNIT_ANGLE,
-                        Expr::Name(Box::new(Name::new(&angle.to_string()))),
-                    );
-                }
-
                 // Previous source range no longer makes sense, but we want to
                 // preserve other things like comments.
                 node.reset_source();
@@ -395,12 +387,6 @@ impl Node<Program> {
                     Expr::Name(Box::new(Name::new(&len.to_string()))),
                 );
             }
-            if let Some(angle) = angle_units {
-                settings.inner.add_or_update(
-                    annotations::SETTINGS_UNIT_ANGLE,
-                    Expr::Name(Box::new(Name::new(&angle.to_string()))),
-                );
-            }
 
             new_program.inner_attrs.push(settings);
         }
@@ -4256,7 +4242,7 @@ startSketchOn(XY)"#;
 
         // Edit the ast.
         let new_program = program
-            .change_default_units(Some(crate::execution::types::UnitLen::Mm), None)
+            .change_default_units(Some(crate::execution::types::UnitLen::Mm))
             .unwrap();
 
         let result = new_program.meta_settings().unwrap();
@@ -4285,7 +4271,7 @@ startSketchOn(XY)
 
         // Edit the ast.
         let new_program = program
-            .change_default_units(Some(crate::execution::types::UnitLen::Mm), None)
+            .change_default_units(Some(crate::execution::types::UnitLen::Mm))
             .unwrap();
 
         let result = new_program.meta_settings().unwrap();
@@ -4320,7 +4306,7 @@ startSketchOn(XY)
         let program = crate::parsing::top_level_parse(code).unwrap();
 
         let new_program = program
-            .change_default_units(Some(crate::execution::types::UnitLen::Cm), None)
+            .change_default_units(Some(crate::execution::types::UnitLen::Cm))
             .unwrap();
 
         let result = new_program.meta_settings().unwrap();

rust/kcl-lib/src/parsing/ast/types/mod.rs

@@ -289,14 +289,13 @@ pub fn kcl_settings(program_json: &str) -> Result<JsValue, String> {
 
 /// Takes a kcl string and Meta settings and changes the meta settings in the kcl string.
 #[wasm_bindgen]
-pub fn change_default_units(code: &str, len_str: &str, angle_str: &str) -> Result<String, String> {
+pub fn change_default_units(code: &str, len_str: &str) -> Result<String, String> {
     console_error_panic_hook::set_once();
 
     let len: Option<kcl_lib::UnitLen> = serde_json::from_str(len_str).map_err(|e| e.to_string())?;
-    let angle: Option<kcl_lib::UnitAngle> = serde_json::from_str(angle_str).map_err(|e| e.to_string())?;
     let program = Program::parse_no_errs(code).map_err(|e| e.to_string())?;
 
-    let new_program = program.change_default_units(len, angle).map_err(|e| e.to_string())?;
+    let new_program = program.change_default_units(len).map_err(|e| e.to_string())?;
 
     let formatted = new_program.recast();
 

rust/kcl-wasm-lib/src/wasm.rs

@@ -22,7 +22,7 @@ type ModalResolve = {
 type ModalReject = boolean
 
 type SetAngleLengthModalProps = InstanceProps<ModalResolve, ModalReject> & {
-  value: number
+  value: string
   valueName: string
   shouldCreateVariable?: boolean
 }
@@ -41,8 +41,10 @@ export const SetAngleLengthModal = ({
   valueName,
   shouldCreateVariable: initialShouldCreateVariable = false,
 }: SetAngleLengthModalProps) => {
-  const [sign, setSign] = useState(Math.sign(Number(initialValue)))
-  const [value, setValue] = useState(String(initialValue * sign))
+  const [sign, setSign] = useState(initialValue.startsWith('-') ? -1 : 1)
+  const [value, setValue] = useState(
+    initialValue.startsWith('-') ? initialValue.substring(1) : initialValue
+  )
   const [shouldCreateVariable, setShouldCreateVariable] = useState(
     initialShouldCreateVariable
   )

src/components/SetAngleLengthModal.tsx

@@ -25,7 +25,7 @@ type ModalReject = boolean
 type GetInfoModalProps = InstanceProps<ModalResolve, ModalReject> & {
   segName: string
   isSegNameEditable: boolean
-  value?: number
+  value?: string
   initialVariableName: string
 }
 
@@ -44,10 +44,12 @@ export const GetInfoModal = ({
   value: initialValue,
   initialVariableName,
 }: GetInfoModalProps) => {
-  const [sign, setSign] = useState(Math.sign(Number(initialValue)))
+  const [sign, setSign] = useState(initialValue?.startsWith('-') ? -1 : 1)
   const [segName, setSegName] = useState(initialSegName)
   const [value, setValue] = useState(
-    initialValue === undefined ? '' : String(Math.abs(initialValue))
+    initialValue?.startsWith('-')
+      ? initialValue.substring(1)
+      : initialValue || ''
   )
   const [shouldCreateVariable, setShouldCreateVariable] = useState(false)
 

src/components/SetHorVertDistanceModal.tsx

@@ -171,7 +171,7 @@ export async function applyConstraintIntersect({
   if (
     !variableName &&
     segName === tagInfo?.tag &&
-    Number(value) === valueUsedInTransform
+    value === valueUsedInTransform
   ) {
     return {
       modifiedAst,

src/components/Toolbar/Intersect.tsx

@@ -108,7 +108,7 @@ export async function applyConstraintAbsDistance({
   if (err(transform1)) return Promise.reject(transform1)
   const { valueUsedInTransform } = transform1
 
-  let forceVal = valueUsedInTransform || 0
+  let forceVal = valueUsedInTransform || ''
   const { valueNode, variableName, newVariableInsertIndex, sign } =
     await getModalInfo({
       value: forceVal,

src/components/Toolbar/SetAbsDistance.tsx

@@ -120,7 +120,7 @@ export async function applyConstraintAngleBetween({
   } as any)
   if (
     segName === tagInfo?.tag &&
-    Number(value) === valueUsedInTransform &&
+    value === valueUsedInTransform &&
     !variableName
   ) {
     return {

src/components/Toolbar/SetAngleBetween.tsx

@@ -127,7 +127,7 @@ export async function applyConstraintHorzVertDistance({
   if (
     !variableName &&
     segName === tagInfo?.tag &&
-    Number(value) === valueUsedInTransform
+    value === valueUsedInTransform
   ) {
     return {
       modifiedAst,