diff --git a/examples/web-site/components/nav.mq.md b/examples/web-site/components/nav.mq.md index f6e9dcf..c6518b3 100644 --- a/examples/web-site/components/nav.mq.md +++ b/examples/web-site/components/nav.mq.md @@ -7,7 +7,7 @@ Static top links for the shell. | 属性 | 值 | 样式 | |------|-----|------| | Home | / | | -| About | /about | | +| New | /_form/article | | | Admin | /admin | | **`nav`** diff --git a/examples/web-site/index.mq.md b/examples/web-site/index.mq.md index a55a875..edc011d 100644 --- a/examples/web-site/index.mq.md +++ b/examples/web-site/index.mq.md @@ -1,6 +1,6 @@ --- title: web-site -description: Home = page table; main inline; class methods assemble. +description: Home = page table; main inline; class methods assemble; form §5.5. > ext/web/web.mq.md > styles/shell.mq.md > components/nav.mq.md @@ -29,9 +29,32 @@ Main content is not a reusable component, so it is authored here. | `title` | articles.`articles`.title | shell.`card_title` | | `body` | articles.`articles`.body | shell.`card_body` | +Article create form (design §5.5): field table + rules table. + +`article_fields` = + +| 字段 | 标签 | 类型 | 必填 | 默认 | +|------|------|------|------|------| +| title | Title | text | true | | +| body | Body | textarea | false | | + +`article_rules` = + +| 字段 | 规则 | 消息 | +|------|------|------| +| title | required | Title is required | +| title | max:120 | Title is too long | +| body | max:8000 | Body is too long | + *`store` = > db.open * *`page` = > web.page title="Marqdo Web Site" intro="

Web Site

Tables + class methods.

" * *`page` = > `page`.compose_components components=`home` * *`page` = > `page`.compose_main main=`index` * + +*`article_form` = > web.form table=articles action=insert * +*`article_form` = > `article_form`.fields fields=`article_fields` * +*`article_form` = > `article_form`.rules rules=`article_rules` * + *`app` = > web.app page=`page` db=`store` admin=True host=127.0.0.1 port=18081 * +*`app` = > `app`.mount_form id=article form=`article_form` * > `app`.listen diff --git a/ext/web/README.md b/ext/web/README.md index 5b4f84d..9a9a2be 100644 --- a/ext/web/README.md +++ b/ext/web/README.md @@ -1,24 +1,26 @@ # ext/web -Official dynamic website extension. Design: [`doc/design/ext-web.md`](../../doc/design/ext-web.md). +Official dynamic website extension: **GFM tables + class methods**. +Design: [`doc/design/ext-web.md`](../../doc/design/ext-web.md). + +| Surface | Import | Classes | +|---------|--------|---------| +| English | `> ext/web/web.mq.md` | `page` · `db` · `app` · `form` · `style` | +| Chinese | `> ext/web/网页.mq.md` | `页面` · `数据库` · `应用` · `表单` · `样式` | ```bash cargo build -p marqdo_plugin_web +# optional install into ~/.marqdo/ext marqdo ext add web ``` -```markdown ---- -> ext/web/web.mq.md ---- +Canonical sample (design §4): [`examples/web-site/`](../../examples/web-site/). -# main -> web.ensure_plugin -*`page` = > web.page title=Hi * -*`app` = > web.app page=`page` * -> `app`.listen +```bash +cargo run -- run examples/web-site/index.mq.md +# http://127.0.0.1:18081/ · /admin ``` -Scaffold: `> web.scaffold dest=./myapp` +Offline assemble smoke: `tests/ext/web-smoke.mq.md`. -Multipage site pack (compose + table CSS + `/_part`): see [`examples/web-site/`](../../examples/web-site/). +**Form / validate / submit** (§5.5): field table + rules + `mount_form` → `GET|POST /_form/{id}`. diff --git a/ext/web/web.mq.md b/ext/web/web.mq.md index dd996d5..45ce23b 100644 --- a/ext/web/web.mq.md +++ b/ext/web/web.mq.md @@ -127,30 +127,40 @@ Style tables live as `##` exports in site style modules; compose resolves them b + `action`=insert + `id`=None -Form API is planned (design §5.5); first trial ships the class shell only. +Field table + rules table; submit writes through `# db`. -**`self`** +> ensure_plugin +**> web_form_new table=`table` action=`action` id=`id`** ## fields + `fields` -**`self`** +**> web_form_fields form=`self` fields=`fields`** + +## rules + + `rules` + +**> web_form_rules form=`self` rules=`rules`** ## validate + `rules`=None + `data` -**`data`** +**> web_form_validate form=`self` rules=`rules` data=`data`** ## render + + `id`=form + + `data`=None + + `errors`=None -**""** +**> web_form_render form=`self` id=`id` data=`data` errors=`errors`** ## submit + `data` + `db` -**`data`** +*`url` = > json.get value=`db` key=url * +**> web_form_submit form=`self` data=`data` url=`url`** # app + `page` @@ -168,8 +178,16 @@ Form API is planned (design §5.5); first trial ships the class shell only. **`self`** +## mount_form + + `id` + + `form` + +Register `GET|POST /_form/{id}` for listen. + +**> web_app_mount_form app=`self` id=`id` form=`form`** + ## listen -Serve `/`, `/_part/{id}`, and optional `/admin` from the assembled page. +Serve `/`, `/_part/{id}`, `/_form/{id}`, and optional `/admin`. **> web_listen app=`self`** diff --git a/ext/web/网页.mq.md b/ext/web/网页.mq.md index 2b592d0..2b6c2b1 100644 --- a/ext/web/网页.mq.md +++ b/ext/web/网页.mq.md @@ -119,30 +119,40 @@ description: 官方网站类(中文)。表格 + 方法;不写袋式胶水 + `动作`=插入 + `id`=None -表单 API 已锁定(设计 §5.5);本试运行仅留类壳。 +字段表 + 校验表;提交经 `# 数据库` 写入。 -**`self`** +> 确保插件 +**> web_form_new table=`表` action=`动作` id=`id`** ## 字段 + `字段` -**`self`** +**> web_form_fields form=`self` fields=`字段`** + +## 规则 + + `规则` + +**> web_form_rules form=`self` rules=`规则`** ## 校验 + `规则`=None + `数据` -**`数据`** +**> web_form_validate form=`self` rules=`规则` data=`数据`** ## 渲染 + + `id`=form + + `数据`=None + + `错误`=None -**""** +**> web_form_render form=`self` id=`id` data=`数据` errors=`错误`** ## 提交 + `数据` + `数据库` -**`数据`** +*`url` = > json.get value=`数据库` key=url * +**> web_form_submit form=`self` data=`数据` url=`url`** # 应用 + `页面` @@ -160,6 +170,12 @@ description: 官方网站类(中文)。表格 + 方法;不写袋式胶水 **`self`** +## 挂载表单 + + `id` + + `表单` + +**> web_app_mount_form app=`self` id=`id` form=`表单`** + ## 监听 **> web_listen app=`self`** diff --git a/plugins/web/src/form.rs b/plugins/web/src/form.rs new file mode 100644 index 0000000..bb1c88c --- /dev/null +++ b/plugins/web/src/form.rs @@ -0,0 +1,507 @@ +//! Form fields / validate / render / submit (design §5.5). + +use serde_json::{json, Map, Value}; + +use crate::db; +use crate::table::normalize_ref; + +const FIELD_KEYS: &[&str] = &["字段", "name", "field", "列"]; +const LABEL_KEYS: &[&str] = &["标签", "label"]; +const TYPE_KEYS: &[&str] = &["类型", "type"]; +const REQ_KEYS: &[&str] = &["必填", "required"]; +const DEF_KEYS: &[&str] = &["默认", "default"]; +const RULE_FIELD_KEYS: &[&str] = &["字段", "field", "name"]; +const RULE_KEYS: &[&str] = &["规则", "rule"]; +const MSG_KEYS: &[&str] = &["消息", "message", "msg"]; + +fn cell_str(v: &Value) -> String { + match v { + Value::Null => String::new(), + Value::String(s) => s.clone(), + Value::Bool(b) => b.to_string(), + Value::Number(n) => n.to_string(), + other => other.to_string(), + } +} + +fn as_str_list(v: &Value) -> Vec { + match v { + Value::Array(a) => a.iter().map(cell_str).collect(), + Value::Null => Vec::new(), + other => vec![cell_str(other)], + } +} + +fn pick<'a>(m: &'a Map, keys: &[&str]) -> Option<&'a Value> { + keys.iter().find_map(|k| m.get(*k)) +} + +fn boolish(v: &Value) -> bool { + match v { + Value::Bool(b) => *b, + Value::String(s) => matches!( + s.trim(), + "1" | "true" | "True" | "yes" | "是" | "必填" | "required" + ), + Value::Number(n) => n.as_i64().unwrap_or(0) != 0, + _ => false, + } +} + +fn esc(s: &str) -> String { + s.replace('&', "&") + .replace('<', "<") + .replace('>', ">") + .replace('"', """) +} + +/// Normalize author field table → `[{name,label,type,required,default}, …]` +pub fn as_form_fields(table: &Value) -> Value { + match table { + Value::Array(rows) => { + let mut out = Vec::new(); + for row in rows { + if let Some(m) = row.as_object() { + let name = normalize_ref(&pick(m, FIELD_KEYS).map(cell_str).unwrap_or_default()); + if name.is_empty() { + continue; + } + let label = pick(m, LABEL_KEYS).map(cell_str).unwrap_or_else(|| name.clone()); + let ty = pick(m, TYPE_KEYS) + .map(cell_str) + .unwrap_or_else(|| "text".into()); + let required = pick(m, REQ_KEYS).map(boolish).unwrap_or(false); + let default = pick(m, DEF_KEYS).map(cell_str).unwrap_or_default(); + out.push(json!({ + "name": name, + "label": label, + "type": ty, + "required": required, + "default": default, + })); + } + } + Value::Array(out) + } + Value::Object(m) => { + let names = pick(m, FIELD_KEYS).map(as_str_list).unwrap_or_default(); + let labels = pick(m, LABEL_KEYS).map(as_str_list).unwrap_or_default(); + let types = pick(m, TYPE_KEYS).map(as_str_list).unwrap_or_default(); + let reqs = pick(m, REQ_KEYS).map(as_str_list).unwrap_or_default(); + let defs = pick(m, DEF_KEYS).map(as_str_list).unwrap_or_default(); + let mut out = Vec::new(); + for (i, name_raw) in names.iter().enumerate() { + let name = normalize_ref(name_raw); + if name.is_empty() { + continue; + } + let label = labels.get(i).cloned().unwrap_or_else(|| name.clone()); + let ty = types.get(i).cloned().unwrap_or_else(|| "text".into()); + let required = reqs + .get(i) + .map(|s| boolish(&Value::String(s.clone()))) + .unwrap_or(false); + let default = defs.get(i).cloned().unwrap_or_default(); + out.push(json!({ + "name": name, + "label": label, + "type": ty, + "required": required, + "default": default, + })); + } + Value::Array(out) + } + _ => json!([]), + } +} + +/// Normalize rules table → `[{field,rule,message}, …]` +pub fn as_form_rules(table: &Value) -> Value { + match table { + Value::Array(rows) => { + let mut out = Vec::new(); + for row in rows { + if let Some(m) = row.as_object() { + let field = + normalize_ref(&pick(m, RULE_FIELD_KEYS).map(cell_str).unwrap_or_default()); + let rule = pick(m, RULE_KEYS).map(cell_str).unwrap_or_default(); + if field.is_empty() || rule.is_empty() { + continue; + } + let message = pick(m, MSG_KEYS).map(cell_str).unwrap_or_default(); + out.push(json!({ "field": field, "rule": rule, "message": message })); + } + } + Value::Array(out) + } + Value::Object(m) => { + let fields = pick(m, RULE_FIELD_KEYS).map(as_str_list).unwrap_or_default(); + let rules = pick(m, RULE_KEYS).map(as_str_list).unwrap_or_default(); + let msgs = pick(m, MSG_KEYS).map(as_str_list).unwrap_or_default(); + let n = fields.len().max(rules.len()); + let mut out = Vec::new(); + for i in 0..n { + let field = normalize_ref(&fields.get(i).cloned().unwrap_or_default()); + let rule = rules.get(i).cloned().unwrap_or_default(); + if field.is_empty() || rule.is_empty() { + continue; + } + let message = msgs.get(i).cloned().unwrap_or_default(); + out.push(json!({ "field": field, "rule": rule, "message": message })); + } + Value::Array(out) + } + _ => json!([]), + } +} + +pub fn form_new(table: Option<&str>, action: &str, id: Option<&str>) -> Value { + let action = match action { + "update" | "更新" => "update", + _ => "insert", + }; + let mut m = Map::new(); + if let Some(t) = table.filter(|s| !s.is_empty()) { + m.insert("table".into(), json!(t)); + } + m.insert("action".into(), json!(action)); + if let Some(i) = id.filter(|s| !s.is_empty()) { + m.insert("id".into(), json!(i)); + } + m.insert("fields".into(), json!([])); + m.insert("rules".into(), json!([])); + m.insert("redirect".into(), json!("/")); + Value::Object(m) +} + +pub fn set_fields(form: &Value, fields: &Value) -> Value { + let mut obj = form.as_object().cloned().unwrap_or_default(); + obj.insert("fields".into(), as_form_fields(fields)); + Value::Object(obj) +} + +pub fn set_rules(form: &Value, rules: &Value) -> Value { + let mut obj = form.as_object().cloned().unwrap_or_default(); + obj.insert("rules".into(), as_form_rules(rules)); + Value::Object(obj) +} + +fn data_map(data: &Value) -> Map { + let rows = crate::table::as_rows(data); + if let Some(Value::Object(m)) = rows.as_array().and_then(|a| a.first()) { + return m.clone(); + } + match data { + Value::Object(m) => m.clone(), + _ => Map::new(), + } +} + +fn field_text(data: &Map, name: &str) -> String { + data.get(name).map(cell_str).unwrap_or_default() +} + +fn default_message(rule: &str, field: &str) -> String { + if let Some(rest) = rule.strip_prefix("min:") { + return format!("{field} must be at least {rest}"); + } + if let Some(rest) = rule.strip_prefix("max:") { + return format!("{field} must be at most {rest}"); + } + if let Some(other) = rule.strip_prefix("match:") { + return format!("{field} must match {other}"); + } + if rule.starts_with("in:") { + return format!("{field} is not an allowed value"); + } + match rule { + "required" => format!("{field} is required"), + "email" => format!("{field} must be an email"), + "url" => format!("{field} must be a URL"), + _ => format!("{field} failed `{rule}`"), + } +} + +fn check_rule(rule: &str, field: &str, data: &Map) -> Option { + let val = field_text(data, field); + let trimmed = val.trim(); + if rule == "required" { + return if trimmed.is_empty() { + Some(default_message(rule, field)) + } else { + None + }; + } + if trimmed.is_empty() { + return None; // other rules skip empty (required covers emptiness) + } + if let Some(n) = rule.strip_prefix("min:") { + if let Ok(min) = n.parse::() { + if let Ok(num) = trimmed.parse::() { + if num < min as f64 { + return Some(default_message(rule, field)); + } + } else if (trimmed.chars().count() as i64) < min { + return Some(default_message(rule, field)); + } + } + return None; + } + if let Some(n) = rule.strip_prefix("max:") { + if let Ok(max) = n.parse::() { + if let Ok(num) = trimmed.parse::() { + if num > max as f64 { + return Some(default_message(rule, field)); + } + } else if (trimmed.chars().count() as i64) > max { + return Some(default_message(rule, field)); + } + } + return None; + } + if let Some(other) = rule.strip_prefix("match:") { + let other_val = field_text(data, other); + if val != other_val { + return Some(default_message(rule, field)); + } + return None; + } + if let Some(list) = rule.strip_prefix("in:") { + let allowed: Vec<&str> = list.split(',').map(|s| s.trim()).collect(); + if !allowed.contains(&trimmed) { + return Some(default_message(rule, field)); + } + return None; + } + match rule { + "email" => { + if !(trimmed.contains('@') && trimmed.contains('.')) { + Some(default_message(rule, field)) + } else { + None + } + } + "url" => { + if !(trimmed.starts_with("http://") || trimmed.starts_with("https://")) { + Some(default_message(rule, field)) + } else { + None + } + } + _ => None, + } +} + +/// Merge field-required + author rules; return `{ok, errors:[{field,message}]}`. +pub fn validate(form: &Value, extra_rules: Option<&Value>, data: &Value) -> Value { + let data = data_map(data); + let fields = form + .get("fields") + .cloned() + .unwrap_or(json!([])); + let mut rules = form + .get("rules") + .and_then(|v| v.as_array()) + .cloned() + .unwrap_or_default(); + if let Some(extra) = extra_rules { + if let Some(arr) = as_form_rules(extra).as_array() { + rules.extend(arr.clone()); + } + } + // Auto required from field table (message overridable by later explicit rules) + if let Some(arr) = fields.as_array() { + for f in arr { + let name = f.get("name").and_then(|v| v.as_str()).unwrap_or(""); + let required = f.get("required").and_then(|v| v.as_bool()).unwrap_or(false); + if required && !name.is_empty() { + let already = rules.iter().any(|r| { + r.get("field").and_then(|v| v.as_str()) == Some(name) + && r.get("rule").and_then(|v| v.as_str()) == Some("required") + }); + if !already { + rules.insert( + 0, + json!({ + "field": name, + "rule": "required", + "message": format!("{name} is required"), + }), + ); + } + } + } + } + + let mut errors = Vec::new(); + for r in &rules { + let field = r.get("field").and_then(|v| v.as_str()).unwrap_or(""); + let rule = r.get("rule").and_then(|v| v.as_str()).unwrap_or(""); + let msg = r.get("message").and_then(|v| v.as_str()).unwrap_or(""); + if field.is_empty() || rule.is_empty() { + continue; + } + if let Some(default_msg) = check_rule(rule, field, &data) { + errors.push(json!({ + "field": field, + "message": if msg.is_empty() { default_msg } else { msg.to_string() }, + })); + } + } + json!({ + "ok": errors.is_empty(), + "errors": errors, + }) +} + +pub fn render(form: &Value, form_id: &str, data: Option<&Value>, errors: Option<&Value>) -> String { + let fields = form + .get("fields") + .and_then(|v| v.as_array()) + .cloned() + .unwrap_or_default(); + let data = data.map(data_map).unwrap_or_default(); + let mut err_map = Map::new(); + if let Some(Value::Array(errs)) = errors { + for e in errs { + if let (Some(f), Some(m)) = ( + e.get("field").and_then(|v| v.as_str()), + e.get("message").and_then(|v| v.as_str()), + ) { + err_map.insert(f.to_string(), json!(m)); + } + } + } else if let Some(Value::Object(m)) = errors { + err_map = m.clone(); + } + + let action = form + .get("action") + .and_then(|v| v.as_str()) + .unwrap_or("insert"); + let table = form + .get("table") + .and_then(|v| v.as_str()) + .unwrap_or(""); + + let mut body = String::from( + r#""#, + ); + body.push_str(&format!("form {id}", id = esc(form_id))); + body.push_str( + r#""#, + ); + body.push_str(&format!( + "

{}

table={} · action={}

", + esc(form_id), + esc(table), + esc(action) + )); + body.push_str(&format!( + "
", + esc(form_id) + )); + for f in &fields { + let name = f.get("name").and_then(|v| v.as_str()).unwrap_or(""); + let label = f.get("label").and_then(|v| v.as_str()).unwrap_or(name); + let ty = f.get("type").and_then(|v| v.as_str()).unwrap_or("text"); + let required = f.get("required").and_then(|v| v.as_bool()).unwrap_or(false); + let default = f.get("default").and_then(|v| v.as_str()).unwrap_or(""); + let value = if data.contains_key(name) { + field_text(&data, name) + } else { + default.to_string() + }; + let req_attr = if required { " required" } else { "" }; + body.push_str(""); + } + body.push_str( + "
home
", + ); + body.push_str("
"); + body +} + +pub fn submit(form: &Value, data: &Value, db_url: &str) -> Result { + let v = validate(form, None, data); + if !v.get("ok").and_then(|x| x.as_bool()).unwrap_or(false) { + return Ok(json!({ + "ok": false, + "errors": v.get("errors").cloned().unwrap_or(json!([])), + })); + } + let table = form + .get("table") + .and_then(|v| v.as_str()) + .ok_or_else(|| "form missing `table`".to_string())?; + let action = form + .get("action") + .and_then(|v| v.as_str()) + .unwrap_or("insert"); + let row = Value::Object(data_map(data)); + let result = if action == "update" { + let id = form + .get("id") + .map(cell_str) + .filter(|s| !s.is_empty()) + .or_else(|| data_map(data).get("id").map(cell_str)) + .ok_or_else(|| "update requires `id`".to_string())?; + db::update(db_url, table, &id, &row)? + } else { + db::insert(db_url, table, &json!([row]))? + }; + let redirect = form + .get("redirect") + .and_then(|v| v.as_str()) + .unwrap_or("/"); + Ok(json!({ + "ok": true, + "result": result, + "redirect": redirect, + })) +} diff --git a/plugins/web/src/http.rs b/plugins/web/src/http.rs index 6ff62ad..8139712 100644 --- a/plugins/web/src/http.rs +++ b/plugins/web/src/http.rs @@ -1,9 +1,10 @@ -//! Blocking HTTP listen: page shell, `/_part/{id}`, optional `/admin`. +//! Blocking HTTP listen: page shell, `/_part/{id}`, `/_form/{id}`, optional `/admin`. +use std::collections::HashMap; use std::net::SocketAddr; use std::sync::Arc; -use axum::extract::{Path, State}; +use axum::extract::{Form, Path, State}; use axum::response::{Html, IntoResponse, Redirect, Response}; use axum::routing::get; use axum::Router; @@ -11,6 +12,7 @@ use serde_json::{json, Map, Value}; use tokio::runtime::Runtime; use crate::db; +use crate::form; use crate::render; #[derive(Clone)] @@ -18,6 +20,7 @@ struct AppState { page: Value, db_url: Option, admin: bool, + forms: HashMap, } pub fn listen( @@ -26,16 +29,19 @@ pub fn listen( host: &str, port: u16, admin: bool, + forms: HashMap, ) -> Result { let state = Arc::new(AppState { page: page.clone(), db_url: db_url.map(|s| s.to_string()), admin, + forms, }); let app = Router::new() .route("/", get(home)) .route("/_part/{id}", get(part)) + .route("/_form/{id}", get(form_get).post(form_post)) .route("/admin", get(admin_home)) .route("/admin/{table}", get(admin_table)) .with_state(state); @@ -73,6 +79,45 @@ async fn part(State(st): State>, Path(id): Path) -> Respon Html(html).into_response() } +async fn form_get(State(st): State>, Path(id): Path) -> Response { + let Some(frm) = st.forms.get(&id) else { + return Html(format!("

unknown form {id}

")).into_response(); + }; + Html(form::render(frm, &id, None, None)).into_response() +} + +async fn form_post( + State(st): State>, + Path(id): Path, + Form(posted): Form>, +) -> Response { + let Some(frm) = st.forms.get(&id) else { + return Html(format!("

unknown form {id}

")).into_response(); + }; + let Some(url) = st.db_url.as_deref() else { + return Html(String::from("

no database

")).into_response(); + }; + let mut data = Map::new(); + for (k, v) in posted { + data.insert(k, json!(v)); + } + let data_v = Value::Object(data); + match form::submit(frm, &data_v, url) { + Ok(res) if res.get("ok").and_then(|v| v.as_bool()).unwrap_or(false) => { + let redirect = res + .get("redirect") + .and_then(|v| v.as_str()) + .unwrap_or("/"); + Redirect::to(redirect).into_response() + } + Ok(res) => { + let errors = res.get("errors"); + Html(form::render(frm, &id, Some(&data_v), errors)).into_response() + } + Err(e) => Html(format!("

submit error: {}

", esc(&e))).into_response(), + } +} + async fn admin_home(State(st): State>) -> Response { if !st.admin { return Html(String::from("

admin disabled

")).into_response(); @@ -88,6 +133,12 @@ async fn admin_home(State(st): State>) -> Response { for t in &tables { body.push_str(&format!("
  • {t}
  • ")); } + if !st.forms.is_empty() { + body.push_str("

    forms

      "); + for id in st.forms.keys() { + body.push_str(&format!("
    • {id}
    • ")); + } + } body.push_str("

    home

    "); Html(body).into_response() } @@ -110,7 +161,9 @@ async fn admin_table(State(st): State>, Path(table): Path) let mut body = format!( "{table}" ); - body.push_str(&format!("

    {table}

    back

    ")); + body.push_str(&format!( + "

    {table}

    back

    " + )); let cols: Vec = rows .first() .and_then(|r| r.as_object()) @@ -124,11 +177,14 @@ async fn admin_table(State(st): State>, Path(table): Path) body.push_str(""); let m = row.as_object().cloned().unwrap_or_else(Map::new); for c in &cols { - let cell = m.get(c).map(|v| match v { - Value::String(s) => s.clone(), - Value::Null => String::new(), - other => other.to_string(), - }).unwrap_or_default(); + let cell = m + .get(c) + .map(|v| match v { + Value::String(s) => s.clone(), + Value::Null => String::new(), + other => other.to_string(), + }) + .unwrap_or_default(); body.push_str(&format!("", esc(&cell))); } body.push_str(""); diff --git a/plugins/web/src/lib.rs b/plugins/web/src/lib.rs index efb5512..0bc963c 100644 --- a/plugins/web/src/lib.rs +++ b/plugins/web/src/lib.rs @@ -2,6 +2,7 @@ mod compose; mod db; +mod form; mod http; mod render; mod table; @@ -330,11 +331,90 @@ web_ffi!(web_app_new, |args: &Value| { "host": host, "port": port, "admin": admin, + "forms": {}, })) }); +web_ffi!(web_app_mount_form, |args: &Value| { + let mut app = args.get("app").cloned().unwrap_or(json!({})); + let id = arg_str(args, "id")?.to_string(); + let form_v = args + .get("form") + .cloned() + .ok_or_else(|| "missing `form`".to_string())?; + let obj = app.as_object_mut().ok_or_else(|| "app must be a map".to_string())?; + let forms = obj + .entry("forms".to_string()) + .or_insert_with(|| json!({})); + let fmap = forms + .as_object_mut() + .ok_or_else(|| "app.forms must be a map".to_string())?; + fmap.insert(id, form_v); + Ok(app) +}); + +web_ffi!(web_form_new, |args: &Value| { + let table = arg_str_opt(args, "table"); + let action = arg_str_opt(args, "action").unwrap_or("insert"); + let id = arg_str_opt(args, "id"); + Ok(form::form_new(table, action, id)) +}); + +web_ffi!(web_form_fields, |args: &Value| { + let form_v = args.get("form").cloned().unwrap_or(json!({})); + let fields = args + .get("fields") + .cloned() + .ok_or_else(|| "missing `fields`".to_string())?; + Ok(form::set_fields(&form_v, &fields)) +}); + +web_ffi!(web_form_rules, |args: &Value| { + let form_v = args.get("form").cloned().unwrap_or(json!({})); + let rules = args + .get("rules") + .cloned() + .ok_or_else(|| "missing `rules`".to_string())?; + Ok(form::set_rules(&form_v, &rules)) +}); + +web_ffi!(web_form_validate, |args: &Value| { + let form_v = args.get("form").cloned().unwrap_or(json!({})); + let data = args + .get("data") + .cloned() + .ok_or_else(|| "missing `data`".to_string())?; + let rules = args.get("rules"); + Ok(form::validate(&form_v, rules, &data)) +}); + +web_ffi!(web_form_render, |args: &Value| { + let form_v = args.get("form").cloned().unwrap_or(json!({})); + let id = arg_str_opt(args, "id").unwrap_or("form"); + let data = args.get("data"); + let errors = args.get("errors"); + Ok(Value::String(form::render( + &form_v, + id, + data, + errors, + ))) +}); + +web_ffi!(web_form_submit, |args: &Value| { + let form_v = args.get("form").cloned().unwrap_or(json!({})); + let data = args + .get("data") + .cloned() + .ok_or_else(|| "missing `data`".to_string())?; + let url = db_url_of(args)?; + form::submit(&form_v, &data, &url) +}); + web_ffi!(web_listen, |args: &Value| { - let (page, db_url, host, port, admin) = if args.get("page").is_some() || args.get("host").is_some() + use std::collections::HashMap; + let (page, db_url, host, port, admin, forms) = if args.get("page").is_some() + || args.get("host").is_some() { let page = args.get("page").cloned().unwrap_or(json!({})); let db_url = db_url_of(args).ok(); @@ -347,7 +427,8 @@ web_ffi!(web_listen, |args: &Value| { Some(Value::Bool(b)) => *b, _ => false, }; - (page, db_url, host.to_string(), port, admin) + let forms = HashMap::new(); + (page, db_url, host.to_string(), port, admin, forms) } else { let app = args.get("app").cloned().unwrap_or_else(|| args.clone()); let page = app.get("page").cloned().unwrap_or(json!({})); @@ -370,9 +451,15 @@ web_ffi!(web_listen, |args: &Value| { .get("admin") .and_then(|v| v.as_bool()) .unwrap_or(false); - (page, db_url, host, port, admin) + let mut forms = HashMap::new(); + if let Some(obj) = app.get("forms").and_then(|v| v.as_object()) { + for (k, v) in obj { + forms.insert(k.clone(), v.clone()); + } + } + (page, db_url, host, port, admin, forms) }; - http::listen(&page, db_url.as_deref(), &host, port, admin) + http::listen(&page, db_url.as_deref(), &host, port, admin, forms) }); fn register(host: &MarqdoHostApi, name: &str, params: &str, fn_ptr: PluginFn) -> c_int { @@ -430,6 +517,21 @@ pub unsafe extern "C" fn marqdo_plugin_init(host: *const MarqdoHostApi) -> c_int "page,db,admin,host,port", web_app_new as PluginFn, ), + ( + "web_app_mount_form", + "app,id,form", + web_app_mount_form as PluginFn, + ), + ("web_form_new", "table,action,id", web_form_new as PluginFn), + ("web_form_fields", "form,fields", web_form_fields as PluginFn), + ("web_form_rules", "form,rules", web_form_rules as PluginFn), + ( + "web_form_validate", + "form,rules,data", + web_form_validate as PluginFn, + ), + ("web_form_render", "form,id", web_form_render as PluginFn), + ("web_form_submit", "form,data,url", web_form_submit as PluginFn), ("web_listen", "app", web_listen as PluginFn), ]; for (name, params, f) in regs { diff --git a/plugins/web/src/render.rs b/plugins/web/src/render.rs index 642f148..2100c61 100644 --- a/plugins/web/src/render.rs +++ b/plugins/web/src/render.rs @@ -3,7 +3,7 @@ use serde_json::{Map, Value}; use crate::db; -use crate::table::{as_bind, normalize_slot, project_rows}; +use crate::table::{as_bind, normalize_ref, normalize_slot, parse_site_path, project_rows, SitePath}; fn esc(s: &str) -> String { s.replace('&', "&") @@ -30,6 +30,33 @@ fn class_attr(css: &str) -> String { } } +fn is_simple_ident(s: &str) -> bool { + !s.is_empty() + && s.chars() + .all(|c| c.is_ascii_alphanumeric() || c == '_' || !c.is_ascii()) +} + +/// True when `back` is a DB field path (`table.col` / `mod.table.col`), not a URL or site path. +fn is_db_bind_back(back: &str) -> bool { + let s = normalize_ref(back); + if s.is_empty() + || s.contains("://") + || s.starts_with('/') + || s.starts_with('#') + || s.starts_with('?') + { + return false; + } + match parse_site_path(&s) { + SitePath::DbField { .. } => true, + SitePath::LibMember { lib, member } => is_simple_ident(&lib) && is_simple_ident(&member), + SitePath::Plain(p) => { + let parts: Vec<&str> = p.split('.').filter(|x| !x.is_empty()).collect(); + parts.len() == 2 && parts.iter().all(|x| is_simple_ident(x)) + } + } +} + fn resolve_links(raw: Option<&Value>, db_url: Option<&str>) -> Vec<(String, String)> { let Some(raw) = raw else { return Vec::new(); @@ -39,11 +66,9 @@ fn resolve_links(raw: Option<&Value>, db_url: Option<&str>) -> Vec<(String, Stri if arr.is_empty() { return Vec::new(); } - let has_db = arr.iter().any(|b| { - b.get("back") - .and_then(|v| v.as_str()) - .is_some_and(|s| s.contains('.')) - }); + let has_db = arr + .iter() + .any(|b| b.get("back").and_then(|v| v.as_str()).is_some_and(is_db_bind_back)); if has_db { let Some(url) = db_url else { return Vec::new(); @@ -80,7 +105,7 @@ fn resolve_links(raw: Option<&Value>, db_url: Option<&str>) -> Vec<(String, Stri } return out; } - // static: front=label back=href + // static: front=label back=href (URLs with `.` must stay here) arr.into_iter() .map(|b| { let label = b.get("front").map(text).unwrap_or_default(); diff --git a/tests/ext/web-fixtures/components/side.mq.md b/tests/ext/web-fixtures/components/side.mq.md index ee4407f..5854320 100644 --- a/tests/ext/web-fixtures/components/side.mq.md +++ b/tests/ext/web-fixtures/components/side.mq.md @@ -5,5 +5,6 @@ | 属性 | 值 | 样式 | |------|-----|------| | Side | / | | +| Docs | https://github.com | | **`side`** diff --git a/tests/ext/web-form-smoke.mq.md b/tests/ext/web-form-smoke.mq.md new file mode 100644 index 0000000..74bd7ad --- /dev/null +++ b/tests/ext/web-form-smoke.mq.md @@ -0,0 +1,70 @@ +--- +title: web form smoke +description: Offline form fields / validate / submit (no listen). +> ext/web/web.mq.md +> web-fixtures/db/articles.mq.md as articles +> lib/json.mq.md +--- + +# main + +*`store` = > web.db url="sqlite:web-fixtures/data/form-smoke.db" * +*`schema` = > articles.schema * +> `store`.init name=articles fields=`schema` + +`fields` = + +| 字段 | 标签 | 类型 | 必填 | 默认 | +|------|------|------|------|------| +| title | Title | text | true | | +| body | Body | textarea | false | | + +`rules` = + +| 字段 | 规则 | 消息 | +|------|------|------| +| title | required | Title is required | +| title | max:120 | Title is too long | + +*`f` = > web.form table=articles action=insert * +*`f` = > `f`.fields fields=`fields` * +*`f` = > `f`.rules rules=`rules` * + +`bad` = + +| title | body | +|-------|------| +| | hello | + +*`v` = > `f`.validate data=`bad` * +*`ok` = > json.get value=`v` key=ok * +1. `ok` + > print text=validate-should-fail +2. * + > print text=validate-ok + +`good` = + +| title | body | +|-------|------| +| From form | Body via submit | + +*`sub` = > `f`.submit data=`good` db=`store` * +*`sok` = > json.get value=`sub` key=ok * +1. `sok` + > print text=submit-ok +2. * + > print text=submit-fail + +*`rows` = > `store`.select table=articles limit=10 * +*`n` = > len value=`rows` * +1. `n` >= 1 + > print text=db-ok +2. * + > print text=db-fail + +*`html` = > `f`.render id=article * +1. `html` + > print text=render-ok +2. * + > print text=render-fail diff --git a/tests/ext/web-smoke.mq.md b/tests/ext/web-smoke.mq.md index f9be7c8..270514a 100644 --- a/tests/ext/web-smoke.mq.md +++ b/tests/ext/web-smoke.mq.md @@ -54,6 +54,12 @@ description: Offline assemble + render markers (no listen). 2. * > print text=compose-nav-fail +*`side` = > json.get value=`page` key=sidebar * +1. `side` + > print text=compose-side-ok +2. * + > print text=compose-side-fail + *`css` = > json.get value=`page` key=styles_css * 1. `css` > print text=styles-ok diff --git a/tests/gold.rs b/tests/gold.rs index 1eeaf79..b74bbd4 100644 --- a/tests/gold.rs +++ b/tests/gold.rs @@ -1234,12 +1234,30 @@ fn ext_web_smoke() { "tests/ext/web-smoke.mq.md", "render-ok compose-nav-ok +compose-side-ok styles-ok compose-ok db-ok", ); } +#[test] +fn ext_web_form_smoke() { + let status = Command::new("cargo") + .args(["build", "-p", "marqdo_plugin_web"]) + .current_dir(env!("CARGO_MANIFEST_DIR")) + .status() + .expect("build web plugin"); + assert!(status.success(), "failed to build marqdo_plugin_web"); + assert_out( + "tests/ext/web-form-smoke.mq.md", + "validate-ok +submit-ok +db-ok +render-ok", + ); +} + #[test] fn ext_agent_framework_smoke() { let status = Command::new("cargo")
    {}