markform 0.1.3 → 0.1.4

package/examples/simple/simple-mock-filled.form.md

@@ -18,33 +18,33 @@ Fill all fields using interactive prompts - no LLM API key needed.
 
 {% field-group id="basic_fields" title="Basic Fields" %}
 
-{% string-field id="name" label="Name" role="user" required=true minLength=2 maxLength=50 %}
+{% field kind="string" id="name" label="Name" role="user" required=true minLength=2 maxLength=50 placeholder="Enter your name" examples=["John Smith", "Jane Doe"] %}
 ```value
 Alice Johnson
 ```
-{% /string-field %}
+{% /field %}
 
 {% instructions ref="name" %}
 Enter your full name (2-50 characters).
 {% /instructions %}
 
-{% string-field id="email" label="Email" role="user" required=true pattern="^[^@]+@[^@]+\\.[^@]+$" %}
+{% field kind="string" id="email" label="Email" role="user" required=true pattern="^[^@]+@[^@]+\\.[^@]+$" placeholder="email@example.com" examples=["alice@company.com", "bob@example.org"] %}
 ```value
 alice@example.com
 ```
-{% /string-field %}
+{% /field %}
 
-{% number-field id="age" label="Age" role="user" required=true min=0 max=150 integer=true %}
+{% field kind="number" id="age" label="Age" role="user" required=true min=0 max=150 integer=true placeholder="25" examples=["18", "30", "45"] %}
 ```value
 32
 ```
-{% /number-field %}
+{% /field %}
 
-{% number-field id="score" label="Score" role="user" min=0.0 max=100.0 %}
+{% field kind="number" id="score" label="Score" role="user" min=0.0 max=100.0 placeholder="85.5" examples=["75.0", "90.5", "100.0"] %}
 ```value
 87.5
 ```
-{% /number-field %}
+{% /field %}
 
 {% instructions ref="score" %}
 Enter a score between 0 and 100 (optional).
@@ -54,13 +54,13 @@ Enter a score between 0 and 100 (optional).
 
 {% field-group id="list_fields" title="List Fields" %}
 
-{% string-list id="tags" label="Tags" role="user" required=true minItems=1 maxItems=5 itemMinLength=2 uniqueItems=true %}
+{% field kind="string_list" id="tags" label="Tags" role="user" required=true minItems=1 maxItems=5 itemMinLength=2 uniqueItems=true %}
 ```value
 typescript
 testing
 forms
 ```
-{% /string-list %}
+{% /field %}
 
 {% instructions ref="tags" %}
 Add 1-5 unique tags (each at least 2 characters).
@@ -70,43 +70,43 @@ Add 1-5 unique tags (each at least 2 characters).
 
 {% field-group id="selection_fields" title="Selection Fields" %}
 
-{% single-select id="priority" label="Priority" role="user" required=true %}
+{% field kind="single_select" id="priority" label="Priority" role="user" required=true %}
 - [ ] Low {% #low %}
 - [x] Medium {% #medium %}
 - [ ] High {% #high %}
-{% /single-select %}
+{% /field %}
 
-{% multi-select id="categories" label="Categories" role="user" required=true minSelections=1 maxSelections=3 %}
+{% field kind="multi_select" id="categories" label="Categories" role="user" required=true minSelections=1 maxSelections=3 %}
 - [x] Frontend {% #frontend %}
 - [x] Backend {% #backend %}
 - [ ] Database {% #database %}
 - [ ] DevOps {% #devops %}
-{% /multi-select %}
+{% /field %}
 
 {% /field-group %}
 
 {% field-group id="checkbox_fields" title="Checkbox Fields" %}
 
-{% checkboxes id="tasks_multi" label="Tasks (Multi Mode)" role="user" checkboxMode="multi" required=true %}
+{% field kind="checkboxes" id="tasks_multi" label="Tasks (Multi Mode)" role="user" checkboxMode="multi" required=true %}
 - [x] Research {% #research %}
 - [x] Design {% #design %}
 - [x] Implement {% #implement %}
 - [-] Test {% #test %}
-{% /checkboxes %}
+{% /field %}
 
 {% instructions ref="tasks_multi" %}
 Track task progress. All must reach done or na state to complete.
 {% /instructions %}
 
-{% checkboxes id="tasks_simple" label="Agreements (Simple Mode)" role="user" checkboxMode="simple" required=true %}
+{% field kind="checkboxes" id="tasks_simple" label="Agreements (Simple Mode)" role="user" checkboxMode="simple" required=true %}
 - [x] I have read the guidelines {% #read_guidelines %}
 - [x] I agree to the terms {% #agree_terms %}
-{% /checkboxes %}
+{% /field %}
 
-{% checkboxes id="confirmations" label="Confirmations (Explicit Mode)" role="user" checkboxMode="explicit" required=true %}
+{% field kind="checkboxes" id="confirmations" label="Confirmations (Explicit Mode)" role="user" checkboxMode="explicit" required=true %}
 - [y] Data has been backed up {% #backed_up %}
 - [n] Stakeholders notified {% #notified %}
-{% /checkboxes %}
+{% /field %}
 
 {% instructions ref="confirmations" %}
 Answer yes or no for each confirmation. All must be explicitly answered.
@@ -116,23 +116,23 @@ Answer yes or no for each confirmation. All must be explicitly answered.
 
 {% field-group id="url_fields" title="URL Fields" %}
 
-{% url-field id="website" label="Website" role="user" required=true %}
+{% field kind="url" id="website" label="Website" role="user" required=true placeholder="https://example.com" examples=["https://github.com/user/repo", "https://company.com"] %}
 ```value
 https://alice.dev
 ```
-{% /url-field %}
+{% /field %}
 
 {% instructions ref="website" %}
 Enter your website URL (must be http or https).
 {% /instructions %}
 
-{% url-list id="references" label="References" role="user" minItems=1 maxItems=5 uniqueItems=true %}
+{% field kind="url_list" id="references" label="References" role="user" minItems=1 maxItems=5 uniqueItems=true placeholder="https://docs.example.com" examples=["https://wikipedia.org/wiki/Example", "https://docs.github.com/en"] %}
 ```value
 https://docs.example.com/guide
 https://github.com/example/project
 https://medium.com/article-about-forms
 ```
-{% /url-list %}
+{% /field %}
 
 {% instructions ref="references" %}
 Add 1-5 unique reference URLs for sources or documentation.
@@ -140,30 +140,94 @@ Add 1-5 unique reference URLs for sources or documentation.
 
 {% /field-group %}
 
+{% field-group id="date_fields" title="Date and Year Fields" %}
+
+{% field kind="date" id="event_date" label="Event Date" role="user" required=true min="2020-01-01" max="2030-12-31" %}
+```value
+2025-06-15
+```
+{% /field %}
+
+{% instructions ref="event_date" %}
+Enter the event date (YYYY-MM-DD format, between 2020 and 2030).
+{% /instructions %}
+
+{% field kind="year" id="founded_year" label="Founded Year" role="user" required=true min=1900 max=2030 %}
+```value
+2020
+```
+{% /field %}
+
+{% instructions ref="founded_year" %}
+Enter the year the company was founded (1900-2030).
+{% /instructions %}
+
+{% /field-group %}
+
+{% field-group id="table_fields" title="Table Fields" %}
+
+{% field kind="table" id="team_members" label="Team Members" role="user" minRows=0 maxRows=5
+   columnIds=["name", "role", "start_date"]
+   columnTypes=[{type: "string", required: true}, "string", "date"] %}
+| Name | Role | Start Date |
+|------|------|------------|
+| Alice | Engineer | 2024-01-15 |
+| Bob | Designer | 2023-06-01 |
+{% /field %}
+
+{% instructions ref="team_members" %}
+Add team members with their name (required), role, and start date.
+{% /instructions %}
+
+{% field kind="table" id="project_tasks" label="Project Tasks" role="user" minRows=0 maxRows=10
+   columnIds=["task", "estimate_hrs", "link"]
+   columnTypes=[{type: "string", required: true}, "number", "url"] %}
+| Task | Estimate (hrs) | Link |
+|------|----------------|------|
+{% /field %}
+
+{% instructions ref="project_tasks" %}
+Optionally add project tasks with estimated hours and reference links.
+{% /instructions %}
+
+{% /field-group %}
+
 {% field-group id="optional_fields" title="Optional Fields" %}
 
-{% string-field id="notes" label="Notes" role="user" %}
+{% field kind="string" id="notes" label="Notes" role="user" %}
 ```value
 This is a test note.
 ```
-{% /string-field %}
+{% /field %}
 
 {% instructions ref="notes" %}
 Add any relevant notes or observations (optional).
 {% /instructions %}
 
-{% number-field id="optional_number" label="Optional Number" role="user" %}{% /number-field %}
+{% field kind="number" id="optional_number" label="Optional Number" role="user" %}{% /field %}
 
-{% url-field id="related_url" label="Related URL" role="user" %}
+{% field kind="url" id="related_url" label="Related URL" role="user" %}
 ```value
 https://markform.dev/docs
 ```
-{% /url-field %}
+{% /field %}
 
 {% instructions ref="related_url" %}
 Optionally add a URL to related documentation or resources.
 {% /instructions %}
 
+{% field kind="date" id="optional_date" label="Optional Date" role="user" %}{% /field %}
+
+{% instructions ref="optional_date" %}
+Optionally add a date (YYYY-MM-DD format).
+{% /instructions %}
+
+{% field kind="year" id="optional_year" label="Optional Year" role="user" %}{% /field %}
+
+{% instructions ref="optional_year" %}
+Optionally add a year.
+{% /instructions %}
+
 {% /field-group %}
 
 {% note id="note-review" ref="simple_test" role="user" %}

package/examples/simple/simple-skipped-filled.form.md

@@ -18,33 +18,33 @@ Fill all fields using interactive prompts - no LLM API key needed.
 
 {% field-group id="basic_fields" title="Basic Fields" %}
 
-{% string-field id="name" label="Name" maxLength=50 minLength=2 required=true role="user" %}
+{% field kind="string" id="name" label="Name" maxLength=50 minLength=2 required=true role="user" placeholder="Enter your name" examples=["John Smith", "Jane Doe"] %}
 ```value
 Test User
 ```
-{% /string-field %}
+{% /field %}
 
 {% instructions ref="name" %}
 Enter your full name (2-50 characters).
 {% /instructions %}
 
-{% string-field id="email" label="Email" pattern="^[^@]+@[^@]+\\.[^@]+$" required=true role="user" %}
+{% field kind="string" id="email" label="Email" pattern="^[^@]+@[^@]+\\.[^@]+$" required=true role="user" placeholder="email@example.com" examples=["alice@company.com", "bob@example.org"] %}
 ```value
 test@example.com
 ```
-{% /string-field %}
+{% /field %}
 
-{% number-field id="age" integer=true label="Age" max=150 min=0 required=true role="user" %}
+{% field kind="number" id="age" integer=true label="Age" max=150 min=0 required=true role="user" placeholder="25" examples=["18", "30", "45"] %}
 ```value
 25
 ```
-{% /number-field %}
+{% /field %}
 
-{% number-field id="score" label="Score" max=100 min=0 role="user" state="skipped" %}
+{% field kind="number" id="score" label="Score" max=100 min=0 role="user" state="skipped" placeholder="85.5" examples=["75.0", "90.5", "100.0"] %}
 ```value
 %SKIP% (Not needed for this test)
 ```
-{% /number-field %}
+{% /field %}
 
 {% instructions ref="score" %}
 Enter a score between 0 and 100 (optional).
@@ -54,12 +54,12 @@ Enter a score between 0 and 100 (optional).
 
 {% field-group id="list_fields" title="List Fields" %}
 
-{% string-list id="tags" itemMinLength=2 label="Tags" maxItems=5 minItems=1 required=true role="user" uniqueItems=true %}
+{% field kind="string_list" id="tags" itemMinLength=2 label="Tags" maxItems=5 minItems=1 required=true role="user" uniqueItems=true %}
 ```value
 typescript
 testing
 ```
-{% /string-list %}
+{% /field %}
 
 {% instructions ref="tags" %}
 Add 1-5 unique tags (each at least 2 characters).
@@ -69,43 +69,43 @@ Add 1-5 unique tags (each at least 2 characters).
 
 {% field-group id="selection_fields" title="Selection Fields" %}
 
-{% single-select id="priority" label="Priority" required=true role="user" %}
+{% field kind="single_select" id="priority" label="Priority" required=true role="user" %}
 - [ ] Low {% #low %}
 - [ ] Medium {% #medium %}
 - [x] High {% #high %}
-{% /single-select %}
+{% /field %}
 
-{% multi-select id="categories" label="Categories" maxSelections=3 minSelections=1 required=true role="user" %}
+{% field kind="multi_select" id="categories" label="Categories" maxSelections=3 minSelections=1 required=true role="user" %}
 - [x] Frontend {% #frontend %}
 - [x] Backend {% #backend %}
 - [ ] Database {% #database %}
 - [ ] DevOps {% #devops %}
-{% /multi-select %}
+{% /field %}
 
 {% /field-group %}
 
 {% field-group id="checkbox_fields" title="Checkbox Fields" %}
 
-{% checkboxes id="tasks_multi" label="Tasks (Multi Mode)" required=true role="user" %}
+{% field kind="checkboxes" id="tasks_multi" label="Tasks (Multi Mode)" required=true role="user" %}
 - [x] Research {% #research %}
 - [x] Design {% #design %}
 - [x] Implement {% #implement %}
 - [-] Test {% #test %}
-{% /checkboxes %}
+{% /field %}
 
 {% instructions ref="tasks_multi" %}
 Track task progress. All must reach done or na state to complete.
 {% /instructions %}
 
-{% checkboxes checkboxMode="simple" id="tasks_simple" label="Agreements (Simple Mode)" required=true role="user" %}
+{% field kind="checkboxes" checkboxMode="simple" id="tasks_simple" label="Agreements (Simple Mode)" required=true role="user" %}
 - [x] I have read the guidelines {% #read_guidelines %}
 - [x] I agree to the terms {% #agree_terms %}
-{% /checkboxes %}
+{% /field %}
 
-{% checkboxes checkboxMode="explicit" id="confirmations" label="Confirmations (Explicit Mode)" required=true role="user" %}
+{% field kind="checkboxes" checkboxMode="explicit" id="confirmations" label="Confirmations (Explicit Mode)" required=true role="user" %}
 - [y] Data has been backed up {% #backed_up %}
 - [n] Stakeholders notified {% #notified %}
-{% /checkboxes %}
+{% /field %}
 
 {% instructions ref="confirmations" %}
 Answer yes or no for each confirmation. All must be explicitly answered.
@@ -115,21 +115,21 @@ Answer yes or no for each confirmation. All must be explicitly answered.
 
 {% field-group id="url_fields" title="URL Fields" %}
 
-{% url-field id="website" label="Website" required=true role="user" %}
+{% field kind="url" id="website" label="Website" required=true role="user" placeholder="https://example.com" examples=["https://github.com/user/repo", "https://company.com"] %}
 ```value
 https://test.example.com
 ```
-{% /url-field %}
+{% /field %}
 
 {% instructions ref="website" %}
 Enter your website URL (must be http or https).
 {% /instructions %}
 
-{% url-list id="references" label="References" maxItems=5 minItems=1 role="user" uniqueItems=true %}
+{% field kind="url_list" id="references" label="References" maxItems=5 minItems=1 role="user" uniqueItems=true placeholder="https://docs.example.com" examples=["https://wikipedia.org/wiki/Example", "https://docs.github.com/en"] %}
 ```value
 https://docs.example.com
 ```
-{% /url-list %}
+{% /field %}
 
 {% instructions ref="references" %}
 Add 1-5 unique reference URLs for sources or documentation.
@@ -137,30 +137,92 @@ Add 1-5 unique reference URLs for sources or documentation.
 
 {% /field-group %}
 
+{% field-group id="date_fields" title="Date and Year Fields" %}
+
+{% field kind="date" id="event_date" label="Event Date" max="2030-12-31" min="2020-01-01" required=true role="user" %}
+```value
+2025-03-15
+```
+{% /field %}
+
+{% instructions ref="event_date" %}
+Enter the event date (YYYY-MM-DD format, between 2020 and 2030).
+{% /instructions %}
+
+{% field kind="year" id="founded_year" label="Founded Year" max=2030 min=1900 required=true role="user" %}
+```value
+2021
+```
+{% /field %}
+
+{% instructions ref="founded_year" %}
+Enter the year the company was founded (1900-2030).
+{% /instructions %}
+
+{% /field-group %}
+
+{% field-group id="table_fields" title="Table Fields" %}
+
+{% field kind="table" id="team_members" label="Team Members" role="user" minRows=0 maxRows=5 state="skipped"
+   columnIds=["name", "role", "start_date"]
+   columnTypes=[{type: "string", required: true}, "string", "date"] %}
+| Name | Role | Start Date |
+|------|------|------------|
+{% /field %}
+
+{% instructions ref="team_members" %}
+Add team members with their name (required), role, and start date.
+{% /instructions %}
+
+{% field kind="table" id="project_tasks" label="Project Tasks" role="user" minRows=0 maxRows=10 state="skipped"
+   columnIds=["task", "estimate_hrs", "link"]
+   columnTypes=[{type: "string", required: true}, "number", "url"] %}
+| Task | Estimate (hrs) | Link |
+|------|----------------|------|
+{% /field %}
+
+{% instructions ref="project_tasks" %}
+Optionally add project tasks with estimated hours and reference links.
+{% /instructions %}
+
+{% /field-group %}
+
 {% field-group id="optional_fields" title="Optional Fields" %}
 
-{% string-field id="notes" label="Notes" role="user" state="skipped" %}
+{% field kind="string" id="notes" label="Notes" role="user" state="skipped" %}
 ```value
 %SKIP% (No notes required)
 ```
-{% /string-field %}
+{% /field %}
 
 {% instructions ref="notes" %}
 Add any relevant notes or observations (optional).
 {% /instructions %}
 
-{% number-field id="optional_number" label="Optional Number" role="user" state="skipped" %}{% /number-field %}
+{% field kind="number" id="optional_number" label="Optional Number" role="user" state="skipped" %}{% /field %}
 
-{% url-field id="related_url" label="Related URL" role="user" state="skipped" %}
+{% field kind="url" id="related_url" label="Related URL" role="user" state="skipped" %}
 ```value
 %SKIP% (No related URL needed)
 ```
-{% /url-field %}
+{% /field %}
 
 {% instructions ref="related_url" %}
 Optionally add a URL to related documentation or resources.
 {% /instructions %}
 
+{% field kind="date" id="optional_date" label="Optional Date" role="user" state="skipped" %}{% /field %}
+
+{% instructions ref="optional_date" %}
+Optionally add a date (YYYY-MM-DD format).
+{% /instructions %}
+
+{% field kind="year" id="optional_year" label="Optional Year" role="user" state="skipped" %}{% /field %}
+
+{% instructions ref="optional_year" %}
+Optionally add a year.
+{% /instructions %}
+
 {% /field-group %}
 
 {% note id="note-summary" ref="simple_test" role="user" %}

package/examples/simple/simple-with-skips.session.yaml

@@ -39,40 +39,40 @@ turns:
           message: Required field "Email" is empty
           severity: required
           priority: 1
-        - ref: name
+        - ref: event_date
           scope: field
           reason: required_missing
-          message: Required field "Name" is empty
+          message: Required field "Event Date" is empty
           severity: required
           priority: 1
-        - ref: priority
+        - ref: founded_year
           scope: field
           reason: required_missing
-          message: Required field "Priority" has no selection
+          message: Required field "Founded Year" is empty
           severity: required
           priority: 1
-        - ref: tags
+        - ref: name
           scope: field
           reason: required_missing
-          message: Required field "Tags" is empty
+          message: Required field "Name" is empty
           severity: required
           priority: 1
-        - ref: tasks_multi
+        - ref: priority
           scope: field
           reason: required_missing
-          message: All items in "Tasks (Multi Mode)" must be completed
+          message: Required field "Priority" has no selection
           severity: required
           priority: 1
-        - ref: tasks_simple
+        - ref: tags
           scope: field
           reason: required_missing
-          message: All items in "Agreements (Simple Mode)" must be checked (2 unchecked)
+          message: Required field "Tags" is empty
           severity: required
           priority: 1
-        - ref: website
+        - ref: tasks_multi
           scope: field
           reason: required_missing
-          message: Required field "Website" is empty
+          message: All items in "Tasks (Multi Mode)" must be completed
           severity: required
           priority: 1
     apply:
@@ -93,6 +93,12 @@ turns:
         - op: set_string
           field_id: email
           value: test@example.com
+        - op: set_date
+          field_id: event_date
+          value: 2025-03-15
+        - op: set_year
+          field_id: founded_year
+          value: 2021
         - op: set_string
           field_id: name
           value: Test User
@@ -111,34 +117,56 @@ turns:
             design: done
             implement: done
             test: na
-        - op: set_checkboxes
-          field_id: tasks_simple
-          values:
-            read_guidelines: done
-            agree_terms: done
-        - op: set_url
-          field_id: website
-          value: https://test.example.com
     after:
-      required_issue_count: 0
-      markdown_sha256: 62c9aad095c2ea5c2947c308c5e4b3c4cbc677a7e481971871c5091d5ca27b02
+      required_issue_count: 2
+      markdown_sha256: b5b261b437d0ea9762f342d8a6e1f44ece1b1f0ae0bd4a8709e8ba84625ecae3
       answered_field_count: 10
       skipped_field_count: 0
   - turn: 2
     inspect:
       issues:
+        - ref: tasks_simple
+          scope: field
+          reason: required_missing
+          message: All items in "Agreements (Simple Mode)" must be checked (2 unchecked)
+          severity: required
+          priority: 1
+        - ref: website
+          scope: field
+          reason: required_missing
+          message: Required field "Website" is empty
+          severity: required
+          priority: 1
         - ref: notes
           scope: field
           reason: optional_empty
           message: Optional field has no value
           severity: recommended
           priority: 3
+        - ref: optional_date
+          scope: field
+          reason: optional_empty
+          message: Optional field has no value
+          severity: recommended
+          priority: 3
         - ref: optional_number
           scope: field
           reason: optional_empty
           message: Optional field has no value
           severity: recommended
           priority: 3
+        - ref: optional_year
+          scope: field
+          reason: optional_empty
+          message: Optional field has no value
+          severity: recommended
+          priority: 3
+        - ref: project_tasks
+          scope: field
+          reason: optional_empty
+          message: Optional field has no value
+          severity: recommended
+          priority: 3
         - ref: references
           scope: field
           reason: optional_empty
@@ -159,14 +187,34 @@ turns:
           priority: 3
     apply:
       patches:
+        - op: set_checkboxes
+          field_id: tasks_simple
+          values:
+            read_guidelines: done
+            agree_terms: done
+        - op: set_url
+          field_id: website
+          value: https://test.example.com
         - op: skip_field
           field_id: notes
           role: agent
           reason: No value in mock form
+        - op: skip_field
+          field_id: optional_date
+          role: agent
+          reason: No value in mock form
         - op: skip_field
           field_id: optional_number
           role: agent
           reason: No value in mock form
+        - op: skip_field
+          field_id: optional_year
+          role: agent
+          reason: No value in mock form
+        - op: skip_field
+          field_id: project_tasks
+          role: agent
+          reason: No value in mock form
         - op: set_url_list
           field_id: references
           items:
@@ -181,9 +229,29 @@ turns:
           reason: No value in mock form
     after:
       required_issue_count: 0
-      markdown_sha256: 5ca306e53bdb0213b0558f6132c7a5af491c40c8765f25bc7047efa0478b7876
-      answered_field_count: 11
-      skipped_field_count: 4
+      markdown_sha256: 943a9dac5094e295b53bd4cf38733fcff32e4311b6e308d5904199f4898d4f5d
+      answered_field_count: 13
+      skipped_field_count: 7
+  - turn: 3
+    inspect:
+      issues:
+        - ref: team_members
+          scope: field
+          reason: optional_empty
+          message: Optional field has no value
+          severity: recommended
+          priority: 3
+    apply:
+      patches:
+        - op: skip_field
+          field_id: team_members
+          role: agent
+          reason: No value in mock form
+    after:
+      required_issue_count: 0
+      markdown_sha256: e19d2e529bceab1dc64310fe2a75d70d062fa060230d7109eb541766c0a0f4e5
+      answered_field_count: 13
+      skipped_field_count: 8
 final:
   expect_complete: true
   expected_completed_form: simple-skipped-filled.form.md