Remove response conditions and require response literals not be padded

Author: istathar

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "technique"
-version = "0.6.6"
+version = "0.7.0"
 edition = "2024"
 description = "A domain specific language for procedures."
 authors = [ "Andrew Cowie" ]

Cargo.toml

@@ -34,10 +34,12 @@ before_anesthesia :
     5.  Does the patient have a:
         -   Known allergy?
                 'No' | 'Yes'
-        -   Difficult airway or aspiration risk?
-                'No' | 'Yes' and equipment/assistance available
-        -   Risk of blood loss > 500 mL?
-                'No' | 'Yes' and two IVs planned and fluids available
+        -   Difficult airway or aspiration risk? If so, ensure equipment and
+            assistance available.
+                'No' | 'Yes'
+        -   Risk of blood loss > 500 mL? If so, plan for two IVs and ensure
+            fluids available.
+                'No' | 'Yes'
 
 before_incision :
 

examples/prototype/SurgicalSafetyChecklist.tq

@@ -157,9 +157,6 @@ fn step_from_scope(scope: &language::Scope, inherited_role: Option<&str>) -> Ste
                 value: response
                     .value()
                     .to_string(),
-                condition: response
-                    .condition()
-                    .map(String::from),
             });
         }
         children.extend(steps_from_scope(subscope, inherited_role));
@@ -277,29 +274,6 @@ checks :
         assert_eq!(steps[1].role, Some("surgeon".into()));
     }
 
-    #[test]
-    fn responses_with_conditions() {
-        let doc = extract(trim(
-            r#"
-checks :
-
-    1. Is the patient ready?
-            'Yes' | 'No' if complications
-            "#,
-        ));
-        let proc = as_procedure(&doc.items[0]);
-        let step = &proc.steps[0];
-        assert_eq!(
-            step.responses
-                .len(),
-            2
-        );
-        assert_eq!(step.responses[0].value, "Yes");
-        assert_eq!(step.responses[0].condition, None);
-        assert_eq!(step.responses[1].value, "No");
-        assert_eq!(step.responses[1].condition, Some("if complications".into()));
-    }
-
     #[test]
     fn sibling_procedures_are_peers() {
         let doc = extract(trim(

src/domain/checklist/adapter.rs

@@ -49,8 +49,7 @@ pub struct Step {
     pub children: Vec<Step>,
 }
 
-/// A response option with an optional condition.
+/// A response option.
 pub struct Response {
     pub value: String,
-    pub condition: Option<String>,
 }

src/domain/checklist/types.rs

@@ -105,7 +105,6 @@ impl Render for Response {
     fn render(&self, out: &mut Markup) {
         out.call("render-response");
         out.param("value", &self.value);
-        out.param_opt("condition", &self.condition);
         out.close();
     }
 }

src/domain/checklist/typst.rs

@@ -248,11 +248,6 @@ impl<'i> Response<'i> {
     pub fn value(&self) -> &'i str {
         self.value
     }
-
-    /// Returns the optional condition.
-    pub fn condition(&self) -> Option<&'i str> {
-        self.condition
-    }
 }
 
 /// Render an Expression as human-readable text.

src/domain/engine.rs

@@ -118,9 +118,6 @@ fn nodes_from_scope(scope: &language::Scope) -> Vec<Node> {
                     value: response
                         .value()
                         .to_string(),
-                    condition: response
-                        .condition()
-                        .map(String::from),
                 });
             }
             children.extend(nodes_from_scope(child));
@@ -168,9 +165,6 @@ fn node_from_step(scope: &language::Scope) -> Node {
                 value: response
                     .value()
                     .to_string(),
-                condition: response
-                    .condition()
-                    .map(String::from),
             });
         }
         children.extend(nodes_from_scope(subscope));

src/domain/procedure/adapter.rs

@@ -68,8 +68,7 @@ pub enum Node {
     },
 }
 
-/// A response option with an optional condition.
+/// A response option.
 pub struct Response {
     pub value: String,
-    pub condition: Option<String>,
 }

src/domain/procedure/types.rs

@@ -218,7 +218,6 @@ impl Render for Response {
     fn render(&self, out: &mut Markup) {
         out.call("render-response");
         out.param("value", &self.value);
-        out.param_opt("condition", &self.condition);
         out.close();
     }
 }