From 9599303c4c85cd0aa4011d9c969bb7fa3d28421c Mon Sep 17 00:00:00 2001 From: cflmy Date: Tue, 11 Aug 2026 15:06:39 +0800 Subject: [PATCH] Rewrite ext/web around tables and class methods. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Drop bag/scaffold glue and rebuild the web plugin for compose, SQLite CRUD, and listen, with call_lib_path support and a §4 English site sample. Co-authored-by: Cursor --- Cargo.lock | 63 -- doc/design/ext-web.md | 991 +++++++++--------- doc/roadmap/ext-web.md | 3 +- examples/web-demo.mq.md | 65 -- examples/web-site/README.md | 10 + examples/web-site/components/foot.mq.md | 9 + examples/web-site/components/nav.mq.md | 13 + examples/web-site/components/side.mq.md | 10 + examples/web-site/db/articles.mq.md | 22 + examples/web-site/db/index.mq.md | 20 + examples/web-site/index.mq.md | 37 + examples/web-site/styles/shell.mq.md | 42 + ext/web/README.md | 2 + ext/web/templates/starter/.env.example | 10 - ext/web/templates/starter/app.mq.md | 51 - .../templates/starter/migrations/001_init.sql | 6 - ext/web/templates/starter/static/theme.css | 509 --------- ext/web/web.mq.md | 424 ++------ ext/web/网页.mq.md | 194 +++- plugins/web/Cargo.toml | 6 +- plugins/web/src/compose.rs | 180 ++++ plugins/web/src/db.rs | 924 ++++------------ plugins/web/src/http.rs | 492 +++------ plugins/web/src/lib.rs | 545 +++++----- plugins/web/src/page.rs | 546 ---------- plugins/web/src/render.rs | 344 ++++++ plugins/web/src/table.rs | 395 +++++++ plugins/web/src/table_util.rs | 627 ----------- plugins/web/src/theme.css | 509 --------- src/host/plugin.rs | 53 +- src/interp.rs | 84 +- tests/ext/web-fixtures/components/foot.mq.md | 9 + tests/ext/web-fixtures/components/nav.mq.md | 10 + tests/ext/web-fixtures/components/side.mq.md | 9 + tests/ext/web-fixtures/db/articles.mq.md | 22 + tests/ext/web-fixtures/styles/shell.mq.md | 39 + tests/ext/web-smoke.mq.md | 143 +-- tests/gold.rs | 12 +- 38 files changed, 2772 insertions(+), 4658 deletions(-) delete mode 100644 examples/web-demo.mq.md create mode 100644 examples/web-site/README.md create mode 100644 examples/web-site/components/foot.mq.md create mode 100644 examples/web-site/components/nav.mq.md create mode 100644 examples/web-site/components/side.mq.md create mode 100644 examples/web-site/db/articles.mq.md create mode 100644 examples/web-site/db/index.mq.md create mode 100644 examples/web-site/index.mq.md create mode 100644 examples/web-site/styles/shell.mq.md delete mode 100644 ext/web/templates/starter/.env.example delete mode 100644 ext/web/templates/starter/app.mq.md delete mode 100644 ext/web/templates/starter/migrations/001_init.sql delete mode 100644 ext/web/templates/starter/static/theme.css create mode 100644 plugins/web/src/compose.rs delete mode 100644 plugins/web/src/page.rs create mode 100644 plugins/web/src/render.rs create mode 100644 plugins/web/src/table.rs delete mode 100644 plugins/web/src/table_util.rs delete mode 100644 plugins/web/src/theme.css create mode 100644 tests/ext/web-fixtures/components/foot.mq.md create mode 100644 tests/ext/web-fixtures/components/nav.mq.md create mode 100644 tests/ext/web-fixtures/components/side.mq.md create mode 100644 tests/ext/web-fixtures/db/articles.mq.md create mode 100644 tests/ext/web-fixtures/styles/shell.mq.md diff --git a/Cargo.lock b/Cargo.lock index 913a116..b182427 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -391,12 +391,6 @@ version = "0.3.33" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2cd50c473c80f6d7c3670a752354b8e569b1a7cbfdc0419ec88e5edad85e0dc7" -[[package]] -name = "futures-sink" -version = "0.3.33" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e34418ac499d6305c2fb5ad0ed2f6ac998c5f8ca209b4510f7f94242c647e307" - [[package]] name = "futures-task" version = "0.3.33" @@ -492,12 +486,6 @@ dependencies = [ "pin-project-lite", ] -[[package]] -name = "http-range-header" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9171a2ea8a68358193d15dd5d70c1c10a2afc3e7e4c5bc92bc9f025cebd7359c" - [[package]] name = "httparse" version = "1.10.1" @@ -716,12 +704,10 @@ name = "marqdo_plugin_web" version = "0.1.0" dependencies = [ "axum", - "chrono", "rusqlite", "serde", "serde_json", "tokio", - "tower-http", ] [[package]] @@ -742,16 +728,6 @@ version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" -[[package]] -name = "mime_guess" -version = "2.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7c44f8e672c00fe5308fa235f821cb4198414e1c77935c1ab6948d3fd78550e" -dependencies = [ - "mime", - "unicase", -] - [[package]] name = "miniz_oxide" version = "0.8.9" @@ -1197,7 +1173,6 @@ version = "1.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "202caea871b69668250d242070849eb495be178ed697a3e98aebce5bc81a0bed" dependencies = [ - "bytes", "libc", "mio", "pin-project-lite", @@ -1218,19 +1193,6 @@ dependencies = [ "syn 3.0.3", ] -[[package]] -name = "tokio-util" -version = "0.7.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "494815d09bf52b5548659851081238f0ca39ff638363907596da739561c62c52" -dependencies = [ - "bytes", - "futures-core", - "futures-sink", - "pin-project-lite", - "tokio", -] - [[package]] name = "tower" version = "0.5.3" @@ -1247,31 +1209,6 @@ dependencies = [ "tracing", ] -[[package]] -name = "tower-http" -version = "0.6.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cfcf7e2740e6fc6d4d688b4ef00650406bb94adf4731e43c096c3a19fe40840" -dependencies = [ - "bitflags", - "bytes", - "futures-core", - "futures-util", - "http", - "http-body", - "http-body-util", - "http-range-header", - "httpdate", - "mime", - "mime_guess", - "percent-encoding", - "pin-project-lite", - "tokio", - "tokio-util", - "tower-layer", - "tower-service", -] - [[package]] name = "tower-layer" version = "0.3.3" diff --git a/doc/design/ext-web.md b/doc/design/ext-web.md index 15ca8c1..ff4da2b 100644 --- a/doc/design/ext-web.md +++ b/doc/design/ext-web.md @@ -1,543 +1,600 @@ -# 官方扩展:`ext/web` 便捷网站(锁定设计) +# 官方扩展:`ext/web` 动态网站 | | | |---|---| -| 状态 | **Accepted(W0–W3 已开工落地;W4 Postgres/Redis/S3 驱动待)** | +| 状态 | **Accepted · 实现中**(旧实现已清空,按本文从零开发) | | 日期 | 2026-08-11 | -| 相关 | [ext-cli.md](ext-cli.md) · [ext-abi.md](ext-abi.md) · [ext-llm.md](ext-llm.md) · [objects.md](objects.md) · [markdown-mapping.md](markdown-mapping.md) §9 · [user-site.md](user-site.md) · [roadmap/ext-web.md](../roadmap/ext-web.md) · [roadmap/tables-maps-footnotes.md](../roadmap/tables-maps-footnotes.md) | -| 安装 | `marqdo ext add web`(中英:`web` / `网页`) | -| 核心目标 | **让用户用官方模板在分钟级拉起带后台的网站**;自定义走表格与赋值绑定,而不是传统路由/REST 堆叠 | +| 相关 | [markdown-mapping.md](markdown-mapping.md) · [module-namespace.md](module-namespace.md) · [objects.md](objects.md) · [ext-abi.md](ext-abi.md) · [ext-cli.md](ext-cli.md) · [stdlib-i18n.md](stdlib-i18n.md) | +| 安装(目标) | `marqdo ext add web`(中英:`web` / `网页`) | +| 本文目的 | 锁定**作者面**与**类 API**;指导实现 | --- ## 0. 一句话 -`ext/web` 不是「又一个微框架」。它是一组 **Marqdo 对象类**(页面壳、库表、绑定、可选对象存储与 Redis),热路径进 **ABI v2 插件** `plugins/web`,与 llm/agent 一样用 **`marqdo ext`** 安装;用户写的是字典/列表表格与赋值式绑定,插件负责异步 HTTP、SQL、迁移与存储驱动。 +`ext/web` 用 **GFM 表格 + Marqdo 类方法** 描述动态网站:表仍是字典/列表嵌套;类方法把表装配成可渲染页面。 +**不改 Marqdo 核心语法**;扩展库存在的理由,正是让「文档即代码」在网站场景下成立。 --- -## 1. 动机与原则 +## 1. 为何要做网络扩展库 -### 1.1 动机 +### 1.1 问题 -今日有静态站([`public/`](../../public/)、[user-site.md](user-site.md))与客户端 HTTPS([`lib/net`](stdlib-modules.md)),但没有一等**动态网站**扩展。用户需要: +若没有专用扩展,作者只能: -1. 官方模板一键出站(含**后台管理面板**)。 -2. 导航 / 侧栏 / 页脚用 **GFM 表**改,不用手写组件树。 -3. 表结构用 **字典 + 列表表**声明,开发中可迁移。 -4. 前后端数据用 **赋值式绑定**,取消繁复接口层。 -5. 可选对象存储、Redis;连接信息进 `.env`(与大模型同一套 dotenv 习惯)。 -6. 网络层允许异步(性能),但对作者保持简洁表面。 +- 手写 JSON 袋、`json.set` 拼装组件/样式;或 +- 要求改语言(让表格单元格求值、点号取值等)。 -### 1.2 设计原则 +二者都破坏 Marqdo 的「代码即文档」。 -| 原则 | 含义 | -|------|------| -| **模板优先** | 默认路径 = scaffold → 改表 → 跑起来;自定义是覆盖槽位,不是从零搭 | -| **类驱动** | 能力以 `#` 对象暴露(`page` / `db` / `bind` / `store` / `cache` / `app`),中英双面 | -| **表即配置** | 导航、路由、schema、后台菜单优先表格几何(见 §5) | -| **赋值即绑定** | 前端槽位 ← 后端查询,用语句赋值;不强制 REST/OpenAPI | -| **插件热路径** | listen / SQL / migrate / S3 / Redis 在 `plugins/web`;`ext/web/**` 不调 `host_*` | -| **dotenv 一致** | `## load_env` → `sys.load_dotenv`;不覆盖已有进程环境;密钥不入库 | -| **可关可选件** | 对象存储、Redis **非必需**;缺配置则相关对象构造失败信息明确,站点仍可只靠 SQLite 跑 | +### 1.2 答案 -### 1.3 非目标(本设计波次) +在 **`ext/web/web.mq.md`(英文)** 与 **`ext/web/网页.mq.md`(中文)** 中各提供一套 **`#` 类**: -- 完整 ORM / GraphQL / 微服务治理 / 多租户 SaaS 平台 -- 在核心 `src/host` 固化 Web 框架(逻辑只进 `ext/` + `plugins/`) -- 与 `marqdo view` 调试 UI 合并为同一产品(可日后互链) -- 第三方扩展市场 -- 强制用户提交 `.env` +- 作者只写**表** + **少量实例方法调用**; +- 表单元格保持**字面量**; +- **寻址字符串**由类方法解析; +- **导入英文文件 → 只用英文 API;导入中文文件 → 只用中文 API**(见 [stdlib-i18n.md](stdlib-i18n.md))。 + +### 1.3 硬约束(评审锁定) + +| # | 约束 | +|---|------| +| C1 | **禁止**为 web 改动 Marqdo 核心:单元格求值、import、点号值读取等保持不变 | +| C2 | 作者面**禁止** `json.parse` / `json.set` 袋胶水、手写 part JSON、手写 assemble 袋 | +| C3 | 能力以 **`#` 类 + `##` 方法** 暴露;**英文库文件只用英文名,中文库文件只用中文名**(见 [stdlib-i18n.md](stdlib-i18n.md));同一 `.mq.md` 内禁止中英 API 混排 | +| C4 | 首页在 **`index.mq.md`**:页面表在此;可复用片段进 `components/`;主体可就地写 | +| C5 | **旧有网络扩展库全部废弃**:`plugins/web`、`ext/web/**`(含现网示例/gold 中依赖旧 API 者)评审通过后**删除或清空后重写**;禁止在旧代码上打补丁演进 | +| C6 | `# db` / `# 数据库` 必须提供完整**增删改查**;列表查询英文方法名为 **`select`**(中文 **`查询`**);后台 `/admin` 与表单提交走同一套写库 API | +| C7 | 用户输入经 `# form` / `# 表单`:字段表 + 校验表;**服务端校验必须在写库前执行**(见 §5.5) | --- -## 2. 布局、安装与导入 - -### 2.1 仓库布局 - -```text -ext/ - web/ - web.mq.md # 英文 L1 - 网页.mq.md # 中文 L1 - templates/ - starter/ # 官方快速启动模板(含后台) - app.mq.md - admin.mq.md - .env.example - migrations/ - static/ - theme.css - README.md # 短用法(指向本文) -plugins/ - web/ - Cargo.toml # marqdo_plugin_web,cdylib name = web - src/ - lib.rs # ABI init / 注册 - http.rs # 异步 HTTP - db.rs # SQL + migrate - store.rs # 对象存储(可选) - cache.rs # Redis(可选) - admin.rs # 后台元数据 → CRUD 页面 -``` - -### 2.2 CLI(对齐 [ext-cli.md](ext-cli.md)) - -```text -marqdo ext list -marqdo ext add web -marqdo ext remove web -``` - -实现:在 [`src/ext_cli.rs`](../../src/ext_cli.rs) `CATALOG` 增加: - -| 字段 | 值 | -|------|-----| -| `id` | `web` | -| `mq_files` | `web/web.mq.md`, `web/网页.mq.md`(及需要一并安装的 `templates/` 树) | -| `native_crate` | `Some("marqdo_plugin_web")` | - -安装根:`MARQDO_EXT` 或 `~/.marqdo/ext`。产物: - -- `{root}/web/*.mq.md` + `templates/` -- `{root}/native/libweb.so`(或 `.dylib` / `.dll`) -- `{root}/web.plugin` 路径提示 - -插件解析顺序同 agent:`web.plugin` → `native/libweb.*` → `MARQDO_WEB_PLUGIN` → `CARGO_TARGET_DIR/{debug,release}/` → … - -### 2.3 脚手架(快速启动) - -```text -marqdo web new myapp --theme=starter -``` - -或纯 Marqdo: - -```markdown -> web.scaffold dest=./myapp theme=starter -``` - -产出目录(锁定): +## 2. 作者心智与目录 ```text myapp/ - index.mq.md # # main → load_env → migrate → listen - admin.mq.md # 后台入口(可被模板页挂进侧栏) - .env.example - migrations/ - 001_init.sql # 由声明式 schema 生成或手写起步 - static/ - theme.css - data/ # gitignore;SQLite 默认路径 + index.mq.md # 入口 + 首页:页面表 +(可选)就地主体表 + 类方法 + listen + pages/ # 子页:同形的页面表(导出布局表或由入口再装配) + components/ # 可复用组件:导出与路径同名的 ##,体为 |属性|值|样式| + styles/ # 样式模块:每个样式一个 ##,体为 |属性|值| + db/ # 库:schema 表 +(可选)open/种子 + data/ # sqlite 等运行时数据(gitignore) ``` -验收口径:**复制模板、填 `.env`、`marqdo run index.mq.md`,浏览器打开即见前台 + `/admin` 后台。** +| 表种 | 列 | 一句话 | +|------|-----|--------| +| **页面表** | `组件` \| `样式` | 本页用哪些组件、各套哪套样式 | +| **组件 / 主体表** | `属性` \| `值` \| `样式` | 前端属性 ↔ 取值(库字段或字面量)↔ 样式名 | +| **样式表** | `属性` \| `值` | CSS 声明 | +| **库结构表** | `字段` \| `类型` \| `可空` | schema | -### 2.4 导入 +--- + +## 3. 表内寻址约定(单元格仍是字符串) + +单元格**不求值**。下列写法是 **web 扩展约定的路径文本**,由 `# 页面` / `# 样式` / `# 数据库` 的方法解析。 + +### 3.1 反引号与裸名 + +| 含义 | 写法 | 例 | +|------|------|-----| +| 要「去导入树 / 定义里解析」的名字 | 反引号 `` `名` `` | `` `nav` ``、`` `title` ``、`` `topnav` ``、`` `articles` ``(表名) | +| 字面量(文案、URL、CSS 属性名/值、SQL 类型、**列名**) | **裸**或 `"…"` | `首页`、`/about`、`font-size`、`integer`、`title`(作为列名时) | + +### 3.2 路径形态(锁定) + +| 场景 | 形态 | 例 | 方法内语义 | +|------|------|-----|------------| +| 引用导入模块的导出 | `模块.`导出`` | `nav.`nav``、`shell.`topnav`` | 在**站点入口模块**的 import 树上调用 `模块.导出`(零参 `##`),取回表 Value | +| 引用库字段 | `模块.`表`.列` | `articles.`articles`.title` | 模块名 = 命名空间(对应导入的 db 文件);`` `表` `` = 库表名;**列名裸写**(列不是变量)→ 运行时绑定 `表.列` | +| 前端属性名 | `` `title` `` | 组件表「属性」列 | 解析为字段名 `title` | +| 样式引用 | 同「模块.导出」或纯样式名 | `shell.`card-title`` | 取回 `|属性|值|` 表并编译为 CSS 类 | + +**刻意不做的事:** + +- 不把「组件变量名」魔法等同于「库表名」; +- 不要求作者写 `json.set` 才能把 `nav` 放进袋; +- 不把 `articles.`articles`.title` 做成语言级表达式。 + +### 3.3 与模块命名空间的关系 + +- 库名来自 frontmatter 导入(茎名或 `as`),**裸名**,见 [module-namespace.md](module-namespace.md)。 +- `nav.`nav`` 中:前段 `nav` = 导入库名;`` `nav` `` = 该库上的 `## nav` 导出。 +- 组件/样式文件应导出 **与路径第二段同名的 `##`**,直接返回表(不要 `## bag` / `## bind` 袋)。 + +--- + +## 4. 规范示例:`index.mq.md`(作者面唯一样板) + +**语言与导入绑定(锁定,纠正手写混用):** + +| 导入 | 库名(默认茎) | 类 / 方法 / 形参 | +|------|----------------|------------------| +| `> ext/web/web.mq.md` | `web` | **仅英文**:`page` · `compose_components` · `db` · `app` · `components=` … | +| `> ext/web/网页.mq.md` | `网页` | **仅中文**:`页面` · `组件装配` · `数据库` · `应用` · `组件=` … | + +禁止:`> ext/web/web.mq.md` 后写 `web.页面` / `` `页`.组件装配 ``(英文库混中文成员)。 +禁止:在 `web.mq.md` 文件内定义中文 `## 组件装配` 别名。中英对等靠**两个文件**,不靠同一文件双份导出。 + +### 4.1 英文面(导入 `web.mq.md`) ```markdown --- +title: web-site +description: Home = page table; main may be inline; class methods assemble. > ext/web/web.mq.md ---- -``` - -中文:`> ext/web/网页.mq.md`。 - -L1 启动时: - -```markdown -*`p` = > plugin.native_path name=web * -> plugin.load path=`p` -``` - -无插件时错误文案与 agent 一致(提示 `cargo build -p marqdo_plugin_web` / `marqdo ext add web`)。 - +> styles/shell.mq.md +> components/nav.mq.md +> components/side.mq.md +> components/foot.mq.md +> db/articles.mq.md +> db/index.mq.md as db --- -## 3. 对象模型(类) - -全部为 `#` 对象 + `##` 方法;中英成对。英文名稳定进插件注册前缀 `web_*`;中文为 L1 别名面。 - -| 英文类 | 中文类 | 职责 | -|--------|--------|------| -| `# app` | `# 应用` | 组合页面/库/绑定;`listen`;挂静态与后台 | -| `# page` | `# 页面` | 壳布局:顶栏 / 侧栏 / 主体 / 底栏 | -| `# db` | `# 数据库` | 连接、声明表、migrate、查询/写入 | -| `# bind` | `# 绑定` | 记录「前端槽位 ← 后端源」;服务时求值 | -| `# store` | `# 对象存储` | 可选 S3 兼容上传/下载/URL | -| `# cache` | `# 缓存` | 可选 Redis get/set/expire | - -继承:用户可用 `# MyPage = > page` 覆盖 `## render` 等(见 [objects.md](objects.md) §5);官方模板示范覆盖主体栏。 - -```mermaid -flowchart LR - env[".env"] --> app - env --> db - env --> store - env --> cache - page --> app - db --> bind - bind --> page - store --> app - cache --> app - app --> http["plugins/web async HTTP"] - db --> sql["plugins/web SQL"] - app --> admin["/admin panel"] -``` - ---- - -## 4. `.env` 配置(与 LLM 同惯例) - -### 4.1 加载 - -```markdown -> web.load_env path=.env -``` - -实现:`## load_env` → `sys.load_dotenv`(不覆盖已有环境变量)。路径相对**源文件目录**(与 `ext/ai/llm` 一致)。 - -### 4.2 键名(锁定) - -```env -# —— HTTP(必填意图:有默认)—— -MARQDO_WEB_HOST=127.0.0.1 -MARQDO_WEB_PORT=8080 -# 可选:对外 URL(对象存储签名、后台链接) -MARQDO_WEB_PUBLIC_URL=http://127.0.0.1:8080 - -# —— 关系库(默认 SQLite)—— -DATABASE_URL=sqlite:./data/app.db -# DATABASE_URL=postgres://user:pass@127.0.0.1:5432/mydb - -# —— Redis(可选)—— -# REDIS_URL=redis://127.0.0.1:6379/0 -# 或 -# MARQDO_REDIS_URL=redis://127.0.0.1:6379/0 - -# —— 对象存储 S3 兼容(可选)—— -# MARQDO_S3_ENDPOINT=https://s3.amazonaws.com -# MARQDO_S3_REGION=us-east-1 -# MARQDO_S3_BUCKET=my-bucket -# MARQDO_S3_ACCESS_KEY= -# MARQDO_S3_SECRET_KEY= -# MARQDO_S3_PUBLIC_BASE=https://cdn.example.com # 可选公开读基址 -``` - -规则: - -| 类别 | 缺失时 | -|------|--------| -| HTTP | 默认 `127.0.0.1:8080` | -| `DATABASE_URL` | 默认 `sqlite:./data/app.db`(相对项目目录) | -| Redis / S3 | **不构造**对应对象;`# cache` / `# store` 返回明确 `configured=false`;站点其它部分仍可用 | - -前缀:`MARQDO_WEB_*` / `MARQDO_S3_*` / `MARQDO_REDIS_*` 避免与 `OPENAI_*` 冲突;`DATABASE_URL` / `REDIS_URL` 为业界通名别名(读取时优先进程已有值)。 - ---- - -## 5. 表格即配置(字典 + 列表) - -沿用已落地表格几何([tables-maps-footnotes.md](../roadmap/tables-maps-footnotes.md)): - -| 几何 | 运行时 | 在 web 中的用途 | -|------|--------|-----------------| -| 1 列竖表 | `List` | 简单菜单项、角色名 | -| ≥2 列 + 多行且首列表头为 `@`/`行`/`row` | `List` of `Map` | **导航 / 侧栏 / 底栏 / schema 字段行** | -| ≥2 列字典表 | `Map` | 主题色、功能开关 | - -### 5.1 页面壳与主体:先对象,再方法绑定 - -```markdown -`nav` = | 前端变量 | 后端数据库 | 绑定css样式 | … - -`articles` = | 字段 | 类型 | 可空 | … - -*`db` = > web.db * -*`articles` = > `db`.init name=articles fields=`articles` * - -`主体` = | 前端变量 | 后端数据库 | 绑定css样式 | … - -*`page` = > web.page title=Demo * -*`page` = > `page`.nav table=`nav` * -*`page` = > `page`.main table=`articles` bind=`主体` layout=cards -``` - -**变量名即表名:** `` `articles` `` 先是结构表,再被 `init name=articles fields=`articles`` 收成 `{_type:db_table,name:articles}` 句柄;之后 `` table=`articles` `` 处处可读。框架**无**默认表名。 - -### 5.2 数据库:表结构 = GFM 表 - -```markdown -`帖子结构` = - -| 字段 | 类型 | 可空 | -|------|------|------| -| id | integer | false | -| title | text | false | -| body | text | true | - -*`库` = > web.db * -> `库`.define table=posts fields=`帖子结构` primary=id -> `库`.migrate -``` - -列名别名:`字段`/`name`/`列`;`类型`/`type`;`可空`/`null`;可选 `默认`/`唯一`。 - -行为锁定: - -1. `define` 经 `as_fields` 吃表格,再 `CREATE TABLE IF NOT EXISTS`。 -2. `migrate`:对照 `_marqdo_migrations`,应用 `migrations/*.sql`。 -3. 默认 SQLite;Postgres 仍属 W4。 - -### 5.3 后台菜单 - -`admin=True` 时自动枚举库中用户表,每张表支持 **增删改查**(列表 / New / Edit / Delete),写入自动记入 `_marqdo_admin_log`(`/admin/log` 可查)。 - ---- - -## 6. L1 API 外形(锁定草稿) - -### 6.1 `# page` / `# 页面` - -| 方法 / 参数 | 含义 | -|------|------| -| `## nav` / `## sidebar` / `## footer` | `table=` 为三列绑定表 | -| `## main` | `table=` 为 `db_table` 句柄(或裸名),`bind=` 为列绑定表 | -| `intro=` / `layout=` | 构造或 `main` 时可设 | -| `## render` | 求值绑定 + 默认主题 HTML | - -### 6.2 `# db` / `# 数据库` - -| 方法 | 含义 | -|------|------| -| `## init` | `name=` + `fields=`(GFM 结构);返回 `db_table` 句柄;**变量名应与 name 相同** | -| `## define` | `init` 别名(`table=` 可为句柄) | -| `## follow` / `## all` / `## insert` | `table=` 接受句柄或裸名 | -| `## migrate` / `## query` | 同前 | - -### 6.3 绑定 = 变量名即表名 + 三列表 - -```markdown -`articles` = - -| 字段 | 类型 | 可空 | -|------|------|------| -| id | integer | false | -| title | text | false | - -*`db` = > web.db * -*`articles` = > `db`.init name=articles fields=`articles` * - -`主体` = - -| 前端变量 | 后端数据库 | 绑定css样式 | -|----------|------------|-------------| -| title | title | card-title | - -*`页` = > web.page title=站 * -*`页` = > `页`.main table=`articles` bind=`主体` layout=cards * -``` - -插入仍用 GFM 行表:`` > `库`.insert table=`articles` rows=`种子` ``。 - -### 6.4 `# store` / `# 对象存储`(可选) - -| 方法 | 含义 | -|------|------| -| 构造 | 读 `MARQDO_S3_*`;未配置 → `ok=false` | -| `## put` | `key=` `path=` 或 `bytes=` | -| `## get_url` | 公开基址或预签名 | -| `## delete` | 删对象 | - -后台「媒体」页在配置存在时显示上传;否则隐藏。 - -### 6.5 `# cache` / `# 缓存`(可选) - -| 方法 | 含义 | -|------|------| -| 构造 | 读 `REDIS_URL` / `MARQDO_REDIS_URL` | -| `## get` / `## set` | `key=` `value=` `ttl=` | -| `## delete` | | - -用于绑定结果缓存、会话票(v1 会话可先 cookie + 服务端 map,Redis 为加速路径)。 - -### 6.6 `# app` / `# 应用` - -```markdown # main -> web.load_env path=.env -*`p` = > plugin.native_path name=web * -> plugin.load path=`p` +`home` = -*`db` = > web.db * -> `db`.init -*`page` = > web.page theme=starter nav=`nav` sidebar=`side` footer=`foot` * -*`bind` = > web.bind page=`page` db=`db` * -> `bind`.set slot=main.items source=posts +| 组件 | 样式 | +|------|------| +| nav.`nav` | shell.`topnav` | +| side.`side` | shell.`side-panel` | +| foot.`foot` | | -*`app` = > web.app page=`page` bind=`bind` db=`db` admin=True * -> `app`.static dir=./static +Main content is not a reusable component, so it is authored here. + +`index` = + +| 属性 | 值 | 样式 | +|------|-----|------| +| `title` | articles.`articles`.title | shell.`card-title` | +| `body` | articles.`articles`.body | shell.`card-body` | + +*`store` = > db.open * +*`page` = > web.page title="Marqdo Web Site" intro="

Web Site

" * +*`page` = > `page`.compose_components components=`home` * +*`page` = > `page`.compose_main main=`index` * +*`app` = > web.app page=`page` db=`store` admin=True host=127.0.0.1 port=18081 * > `app`.listen ``` -| 方法 | 含义 | -|------|------| -| `## static` | 挂静态目录 | -| `## mount` | `path=` `page=` 额外页面 | -| `## listen` | 阻塞当前 `# main`:内部跑**异步**运行时直到进程结束 | -| `## admin` | `True` 时挂载 `/admin`(默认 True 于 starter) | +说明:表头列名可用中文(`组件`/`样式`/`属性`/`值`)——那是**表约定词汇**,不是库成员名;库成员必须与导入语言一致。 -中文:`加载环境` / `应用` / `监听` / `静态` / `绑定` / `数据库` / `页面`。 +### 4.2 中文面(导入 `网页.mq.md`) +```markdown +--- +title: 站点 +> ext/web/网页.mq.md +> styles/shell.mq.md +> components/nav.mq.md +> components/side.mq.md +> components/foot.mq.md +> db/articles.mq.md +> db/index.mq.md as db --- -## 7. 后台管理面板 +# main -### 7.1 目标 +`首页` = -官方模板**默认带后台**:登录后按 schema 对表做列表 / 新建 / 编辑 / 删除;菜单可表覆盖(§5.3)。 - -### 7.2 路由约定(锁定) - -| 路径 | 行为 | +| 组件 | 样式 | |------|------| -| `/admin` | 仪表盘(表计数、快捷入口) | -| `/admin/login` | 登录 | -| `/admin/{table}` | 列表 | -| `/admin/{table}/new` | 新建 | -| `/admin/{table}/{id}` | 编辑 | +| nav.`nav` | shell.`topnav` | +| side.`side` | shell.`side-panel` | +| foot.`foot` | | -### 7.3 认证(v1) +主体不是可复用组件,因此就地撰写。 -```env -MARQDO_WEB_ADMIN_USER=admin -MARQDO_WEB_ADMIN_PASSWORD=change-me +`index` = + +| 属性 | 值 | 样式 | +|------|-----|------| +| `title` | articles.`articles`.title | shell.`card-title` | +| `body` | articles.`articles`.body | shell.`card-body` | + +*`库` = > db.open * +*`页` = > 网页.页面 标题="站点" 引言="

站点

" * +*`页` = > `页`.组件装配 组件=`首页` * +*`页` = > `页`.主体装配 主体=`index` * +*`应用` = > 网页.应用 页面=`页` 数据库=`库` 后台=True 主机=127.0.0.1 端口=18081 * +> `应用`.监听 ``` -- 会话:签名 cookie(密钥 `MARQDO_WEB_SECRET`,缺省则由插件首次启动生成并打印警告)。 -- v1 **不做** OAuth;可后续加。 -- 未设密码时 starter 仅绑定 `127.0.0.1` 并警告。 - -### 7.4 与绑定关系 - -后台写库 → 前台 `bind` 每请求读库 → 用户**无需**自写同步 API。 +**允许出现在 index 的非表内容:** frontmatter 导入、开库一行、构造页面/应用并装配、`listen` / `监听`。 +**不允许:** `json.*` 袋、手写 `/_part` 注册、中英 API 混用。 --- -## 8. 异步网络(实现细节) +## 5. 类 API(分文件 · 分语言) -### 8.1 为何异步 +依据 [stdlib-i18n.md](stdlib-i18n.md):**导入哪个文件,就用哪套名字。** +`ext/web/web.mq.md` = 全英文;`ext/web/网页.mq.md` = 全中文。中文实现可委托插件同一套原语,或薄封装英文库,但**对外导出的 `#` / `##` / 形参名必须是中文**。 -HTTP + DB + S3/Redis 适合在插件内用异步多路复用;避免一请求一线程撑满。 +### 5.1 页面 · `page` / `页面` -### 8.2 边界 +**英文(`web.mq.md`):** -| 层 | 模型 | +```markdown +# page + + `title`=… + + `intro`=… + +## compose_components + + `components` # page table |组件|样式| + +## compose_main + + `main` # bind table |属性|值|样式| +``` + +**中文(`网页.mq.md`):** + +```markdown +# 页面 + + `标题`=… + + `引言`=… + +## 组件装配 + + `组件` + +## 主体装配 + + `主体` +``` + +| 行为 | 说明 | +|------|------| +| compose_components / 组件装配 | 解析组件·样式路径 → 填 nav/sidebar/footer → CSS → 登记 part | +| compose_main / 主体装配 | 解析库字段与样式路径 → 填 main → 登记 part(如 id=`index`) | + +**槽位推断:** 由组件导出名决定(`nav`→顶栏,`side`→侧栏,`foot`→底栏;其余→main)。 + +### 5.2 样式 · `style` / `样式` + +**英文:** `# style` · `## process` · `+ style=` / `name=` / `path=` +**中文:** `# 样式` · `## 样式处理` · `+ 样式=` / `名=` / `路径=` + +页面装配可内部调用;作者一般不必在 index 显式调。 + +### 5.3 数据库 · `db` / `数据库` + +完整**增删改查**;页面绑定、种子、`/admin`、表单提交共用。 + +**英文(`web.mq.md`):** + +```markdown +# db + + `url`=… + +## init + + `name` + + `fields` # or table= schema + +## insert + + `table` + + `rows` + +## select + + `table` + + `where`=None # optional simple filters + + `limit`=200 + +## get + + `table` + + `id` + +## update + + `table` + + `id` + + `row` + +## delete + + `table` + + `id` + +## exec + + `sql` + + `args`=None # escape hatch: raw SQL (not everyday authoring) +``` + +**中文(`网页.mq.md`):** + +```markdown +# 数据库 + + `地址`=… + +## 初始化 + + `数据库表` # 或 名= + 字段= + +## 插入 + + `表` + + `行` # 或 多行= + +## 查询 + + `表` + + `条件`=None + + `上限`=200 + +## 获取 + + `表` + + `id` + +## 更新 + + `表` + + `id` + + `行` + +## 删除 + + `表` + + `id` + +## 执行 + + `sql` + + `参数`=None +``` + +| 中文 | 英文 | 职责 | +|------|------|------| +| 初始化 | `init` | 建表;登记表名 | +| 插入 | `insert` | 增 | +| 查询 | `select` | 查列表(可带简单条件 / limit) | +| 获取 | `get` | 按主键一行 | +| 更新 | `update` | 改 | +| 删除 | `delete` | 删 | +| 执行 | `exec` | 可选原始 SQL(进阶) | + +`table=` / `表=` 接受表名或句柄;行数据优先 GFM 表。 +**命名锁定:** 列表查询用 `select` / `查询`,**不用** `all`;原始 SQL 用 `exec` / `执行`,避免与 `select` 混淆。 + +### 5.4 应用 · `app` / `应用` + +**英文:** `# app` · `## route` · `## listen` · 形参 `page` `db` `admin` `host` `port` +**中文:** `# 应用` · `## 路由` · `## 监听` · 形参 `页面` `数据库` `后台` `主机` `端口` + +`listen` / `监听`:加载插件、注入 `db_url`、按页面 part 提供 `/_part/{id}`、启动 HTTP。作者不必手写 part 注册。 + +### 5.5 表单 · `form` / `表单`(规划锁定) + +用户输入也走「表 + 类方法」,与页面/库同一心智;**提交最终调用 `# db` 的 insert/update**,不另开旁路。 + +**英文(`web.mq.md`):** + +```markdown +# form + + `table`=None # bound db table name (optional until submit) + + `action`=insert # insert | update + + `id`=None # required when action=update + +## fields + + `fields` # |字段|标签|类型|必填|默认|… + +## validate + + `rules`=None # |字段|规则|消息|… (optional extra rules) + + `data` # submitted row / map + +## render + # → HTML form (or form descriptor for page slot) + +## submit + + `data` + + `db` # db handle +``` + +**中文(`网页.mq.md`):** + +```markdown +# 表单 + + `表`=None + + `动作`=插入 # 插入 | 更新 + + `id`=None + +## 字段 + + `字段` + +## 校验 + + `规则`=None + + `数据` + +## 渲染 + +## 提交 + + `数据` + + `数据库` +``` + +#### 5.5.1 字段表(作者面) + +```markdown +`文章表单` = + +| 字段 | 标签 | 类型 | 必填 | 默认 | +|------|------|------|------|------| +| title | 标题 | text | true | | +| body | 正文 | textarea | false | | +``` + +| 列 | 含义 | |----|------| -| Marqdo `# main` | `` > `app`.listen `` **同步阻塞**至停机(作者心智简单) | -| `plugins/web` | 内部 **tokio**(或同等)异步:accept、handler、连接池 | -| 绑定 / 页面 render | 在异步 handler 中调用;必要时 `spawn_blocking` 跑短 Marqdo 求值 | +| `字段` | 对应库列名(裸名或 `` `列` ``,与 schema 对齐) | +| `标签` | 展示文案(字面量) | +| `类型` | 控件/值类型:`text` `textarea` `number` `email` `url` `checkbox` `select` … | +| `必填` | 是否必填 | +| `默认` | 可选默认值 | -不在本波把「异步」关键词暴露进 Marqdo 语法;性能优化留在插件。 +#### 5.5.2 校验表(作者面) -### 8.3 注册名(ABI 草案) +```markdown +`文章校验` = -| 注册名 | 参数(CSV) | 作用 | -|--------|-------------|------| -| `web_listen` | `host,port,routes,static_dir` | 启动异步服务器(阻塞至停) | -| `web_db_open` | `url` | 打开池 | -| `web_db_migrate` | `dir` | 执行迁移 | -| `web_db_exec` | `sql,args` | 执行 | -| `web_db_query` | `sql,args` | 查询 → JSON 行数组 | -| `web_store_put` | `key,path` | 可选 | -| `web_store_url` | `key,ttl` | 可选 | -| `web_cache_get` / `web_cache_set` | `key` / `key,value,ttl` | 可选 | -| `web_admin_meta` | `schema` | 后台元数据 | +| 字段 | 规则 | 消息 | +|------|------|------| +| title | required | 标题不能为空 | +| title | max:120 | 标题过长 | +| body | max:8000 | 正文过长 | +``` -ABI:**v2** + JSON 参数/返回([ext-abi.md](ext-abi.md))。`ext/web/**` 只经 `plugin.load` 调上述名。 +| 规则(初版) | 含义 | +|--------------|------| +| `required` | 非空 | +| `min:N` / `max:N` | 字符串长度或数值范围 | +| `email` / `url` | 格式 | +| `match:字段` | 与另一字段相等(如确认密码) | +| `in:a,b,c` | 枚举 | -### 8.4 路由如何从「表 + 绑定」生成 +schema 上的「可空 / 类型」在 **submit 时自动并入校验**(不必重复写 `required`,但校验表可覆盖消息)。 -传统写法(**不作为主推**): +#### 5.5.3 行为流程 ```text -GET /api/posts → handler → JSON +render → 按字段表出 HTML(或嵌入 page 主区) +用户填写 → POST /_form/{id} 或同页提交 +validate → 合并 schema + 校验表;失败则带回字段级错误、不写库 +submit → action=insert → db.insert;action=update → db.update + → 成功后刷新槽位或跳转(由 form 选项约定) ``` -本扩展主推: - -1. 顶栏/侧栏 `href` → 服务端渲染的 **页面路由**(HTML)。 -2. 数据来自 `bind`,不是并行维护一套 `/api/*`。 -3. 后台 CRUD 由插件按表自动生成 HTML 表单;若用户需要 JSON,可选用 `## api=True` 挂只读导出(非默认)。 - ---- - -## 9. 官方模板(starter)内容 - -| 文件 | 作用 | -|------|------| -| `index.mq.md` | 前台:nav/side/foot 表 + bind posts + listen | -| `admin` 挂载 | `app admin=True` | -| `migrations/001_init.sql` | `posts` 示例表 | -| `static/theme.css` | 单文件主题;可读、低依赖、非「紫渐变 AI 模板」 | -| `.env.example` | §4.2 全键注释 | - -自定义路径: - -1. **改表**:导航/字段/菜单。 -2. **改绑定**:`bind.set` 换源表或加 `limit`。 -3. **换主题**:`theme=` 或覆盖 `static/`。 -4. **继承页面类**:只重写 `## body`。 -5. **关后台**:`admin=False`。 - ---- - -## 10. 与静态站 / `lib/net` 的关系 - -| 能力 | 归属 | -|------|------| -| gh-pages 静态文档 | [user-site.md](user-site.md) / `public/` | -| 出站 HTTPS 客户端 | `lib/net`(llm 已用) | -| 入站站点 + DB + 后台 | **`ext/web`(本文)** | - -三者互补,不合并命令。 - ---- - -## 11. 落地阶段(实现时遵循) - -详见 [roadmap/ext-web.md](../roadmap/ext-web.md)。摘要: - -| 阶段 | 内容 | 验收 | -|------|------|------| -| **W0** | CATALOG + 空 L1 + 插件 `web_listen` 回固定 HTML | `ext add web`;浏览器见 Hello | -| **W1** | `.env` 端口;`page` 四栏;nav 表 → 路由;static | 改 nav 表即改链接 | -| **W2** | SQLite `define`/`migrate`/`all`;金样临时目录 | init 后表存在 | -| **W3** | `bind.set` + starter 模板 + `/admin` CRUD | 模板一键站 | -| **W4** | Postgres;可选 Redis / S3;文档与示例 | 可选件缺省不炸 | - -金样目录建议:`tests/ext/web-*.mq.md`;live 类需 `.env` 的单独门控。 - ---- - -## 12. 错误与安全基线 - -| 项 | 约定 | +| 层 | 校验 | |----|------| -| 无插件 | L1 打印可操作错误后 `sys.exit` | -| SQL | 用户 `query` 必须参数化;后台生成语句只用白名单列名(来自 schema) | -| 上传 | 限制大小与扩展名;默认仅管理员 | -| CORS | v1 同站 SSR 为主;不默认放开 `*` | -| 密钥 | `.env` / `.gitignore`;文档强调勿提交 | +| **服务端(必须)** | `validate` 在写库前执行;唯一可信边界 | +| **浏览器(可选增强)** | 同源规则可生成 `required`/`maxlength` 等 HTML 属性;**不能**替代服务端 | + +`/admin` 的新建/编辑页 = 内置 form:字段来自 schema,校验来自类型/可空;与站点自定义 form **同一套** `validate` + `db.insert`/`update`。 + +#### 5.5.4 与页面的关系 + +- 表单可以是独立路由页,或页面表里的一个「组件」导出(仍用 `|属性|值|样式|` 描述展示,提交走 form 类)。 +- 初版优先:**独立 form 句柄 + `app` 挂载提交端点**;嵌入页面槽位为随后波次。 + +### 5.6 文件职责 + +| 文件 | 内容 | +|------|------| +| `ext/web/web.mq.md` | 英文 `# page` `# style` `# db` `# form` `# app` | +| `ext/web/网页.mq.md` | 中文 `# 页面` `# 样式` `# 数据库` `# 表单` `# 应用`(可包装英文实现,**不得**把中文名写进 `web.mq.md`) | --- -## 13. 文档与索引更新清单(实现前) +## 6. 模块导出形状(配合寻址) -- 本文:`doc/design/ext-web.md`(锁定设计) -- 路线图:`doc/roadmap/ext-web.md`(阶段与开放点收敛) -- [ext-cli.md](ext-cli.md) catalog 行指向本文 -- [doc/README.md](../README.md) 增加 design 链接 +### 6.1 组件 `components/nav.mq.md` -实现开始时再动:`src/ext_cli.rs`、`plugins/web`、`ext/web/*`、`Cargo.toml` workspace、`tests/gold.rs`。 +```markdown +## nav + +`nav` = + +| 属性 | 值 | 样式 | +|------|-----|------| +| `title` | `nav`.`title` | | +| `href` | `nav`.`href` | | + +**`nav`** +``` + +说明:组件**内部**绑定仍可用 `` `表`.`列` ``(表名+列名皆引用)。与 index 主体里「模块命名空间 + 裸列名」的 `articles.`articles`.title` 分工: + +- **跨文件、带导入命名空间** → `模块.`表`.列`; +- **组件文件内、表已明确** → `` `表`.`列` `` 即可。 + +(若评审希望全站统一为一种形态,可在评审意见中二选一;默认允许上述两种。) + +### 6.2 样式 `styles/shell.mq.md` + +每个样式一个 `##`,**禁止** `## bag` + `json.set`: + +```markdown +## topnav +… |属性|值| … +**`topnav`** + +## card-title +… +``` + +### 6.3 库 `db/articles.mq.md` / `db/index.mq.md` + +- `articles`:`## schema`(或同名导出)返回结构表; +- `index`:`## open` → 确保插件、建库、init、幂等种子,返回 `# 数据库` 句柄。 + +--- + +## 7. 运行时职责划分 + +```text +作者 .mq.md 表(字面量单元格) + │ + ▼ + ext/web 类方法(Marqdo) + │ 解析路径;需要时经 ABI host_query + │ 调用入口模块 import 树上的 lib.member + ▼ + plugins/web(HTTP / SQL / HTML 壳) + │ + ▼ + 浏览器:四区布局 + /_part 局部刷新 + /admin(可选) +``` + +| 层 | 做 | 不做 | +|----|----|------| +| Marqdo 核心 | 表→Value、类/方法、import | 不识别 web 路径语法 | +| `ext/web/*.mq.md` | 作者 API、中英面、委托插件 | 不直接 `host_*` | +| `plugins/web` | 路径解析辅助、装配结果、listen、SQL、渲染 | 不要求作者写袋 | + +**实现要点(评审通过后再做):** + +1. ABI `host_query("call_lib_path")`:在**站点入口模块**上执行 `lib.member`; +2. 插件函数由类方法调用(如 compose_components / compose_main); +3. `listen` 合并页面内 part,注入 `db_url`。 + +--- + +## 8. 全部废弃 · 从头开发(锁定) + +**旧有网络扩展库内容一律作废**,包括但不限于: + +| 范围 | 处理 | +|------|------| +| [`plugins/web/`](../../plugins/web/) | 评审通过后**删除或清空**,按本文重写 cdylib | +| [`ext/web/`](../../ext/web/)(`web.mq.md` / `网页.mq.md` / templates) | 同上,**不**在旧 L1 上打补丁 | +| 依赖旧 API 的示例(如当前 `examples/web-site`、`web-demo`、`man-write-site` 可跑胶水版) | 按 §4 规范重写或暂时移除 | +| 依赖旧 API 的 gold / 单测 | 删除后按新 API 重写 | +| 本文之前的袋式 / assemble / wire / `## bag` 等作者面 | 永久移出正典 | + +**禁止**:在遗留代码上「修到能跑」再文档化。 +**允许**:实现时参考旧代码中的 HTTP/SQLite 技术经验,但**新树另起**,不以 ABI 表面或作者面兼容为目标。 + +历史摸索中明确不再回归的作者面模式: + +- `json.parse` / `json.set` 拼 components/styles 袋; +- 手写 `web.assemble` + 袋参数; +- 手写 part JSON + `` `app`.part ``; +- `|前端变量|后端数据库|` 填路由; +- 「变量名即表名」魔法默认表; +- 样式 `## bag`;掏空 index 只留 `wire.boot`。 + +--- + +## 9. 非本波次(可记入路线图,不挡作者面评审) + +- Postgres / Redis / S3 驱动细节(SQLite 先落地); +- 复杂权限与多租户; +- 子页路由糖的更多约定(`# 应用.route` 已够用); +- `/admin` 的视觉与交互细化(CRUD/表单必须走 §5.3–§5.5;UI 可后做); +- 表单嵌入页面槽位的更多版式(§5.5.4 初版先独立挂载)。 + +--- + +## 10. 评审清单 + +请确认或批注: + +1. **§3 路径**:`模块.`导出`` 与 `模块.`表`.列`(列裸名)是否定为唯一正典?组件内 `` `表`.`列` `` 是否保留? +2. **§4 index**:开库是否允许单独一行 `` db.open ``,还是必须进一步藏进 `web.应用`? +3. **§5 分文件**:英文 `web.mq.md` / 中文 `网页.mq.md` 是否严格分语言、禁止混排? +4. **§5.3**:列表查询用 `select` / `查询`、原始 SQL 用 `exec` / `执行` 是否认可? +5. **§5.5 表单/校验**:字段表、校验表、服务端必校、admin 共用是否认可? +6. **§5 槽位**:仅由组件导出名推断,是否足够? +7. **§8 废弃**:是否确认**全部推倒重来**、不兼容旧实现? + +评审通过后:冻结本文为 Accepted → **清空旧 web 扩展代码** → 按本文从零实现(骨架 → db CRUD/`select` → form/validate → 页面装配 → app listen → 规范示例 → gold)。 diff --git a/doc/roadmap/ext-web.md b/doc/roadmap/ext-web.md index 3687cf9..04d6633 100644 --- a/doc/roadmap/ext-web.md +++ b/doc/roadmap/ext-web.md @@ -14,7 +14,7 @@ ## 1. 目标回顾(一句) -官方模板分钟级拉起带 **后台** 的网站;导航/库表用 **GFM 表**;前后端用 **赋值式绑定**;热路径进 **ABI 插件**;可选 S3 / Redis。 +**表格完成动态站**:页面表拼组件、组件表绑库与样式、样式表定外观;热路径进 ABI 插件;可选 S3 / Redis。人写目标见设计 §0.1 与 `examples/man-write-site/`。 --- @@ -26,6 +26,7 @@ | **W1** | env 端口;`page` 四栏;nav 表;static | **done** | | **W2** | SQLite `define`/`migrate`/`all` | **done** | | **W3** | 三列绑定;变量名即表名;`/admin` CRUD+日志+布局 | **done**(登录鉴权仍简) | +| **W3.5** | 人写面首版:`web.assemble` + `` `表`.`字段` `` + `examples/man-write-site` | **done**(编排袋仍可再瘦) | | **W4** | Postgres;Redis / S3 驱动 | pending | 验收金样:`tests/ext/web-smoke.mq.md`、`ext_cli_add_web`。 diff --git a/examples/web-demo.mq.md b/examples/web-demo.mq.md deleted file mode 100644 index e8f15c3..0000000 --- a/examples/web-demo.mq.md +++ /dev/null @@ -1,65 +0,0 @@ ---- -title: web demo -> ext/web/web.mq.md ---- - -# main - -> web.ensure_plugin - -`nav` = - -| 前端变量 | 后端数据库 | 绑定css样式 | -|----------|------------|-------------| -| 首页 | / | | -| 管理 | /admin | | - -`side` = - -| 前端变量 | 后端数据库 | 绑定css样式 | -|----------|------------|-------------| -| 全部文章 | / | | -| 管理后台 | /admin | | - -`foot` = - -| 前端变量 | 后端数据库 | 绑定css样式 | -|----------|------------|-------------| -| Marqdo | https://github.com/cflmy/marqdo | | - -`articles` = - -| 字段 | 类型 | 可空 | -|------|------|------| -| id | integer | false | -| title | text | false | -| body | text | true | - -`主体` = - -| 前端变量 | 后端数据库 | 绑定css样式 | -|----------|------------|-------------| -| title | title | card-title | -| body | body | card-body | - -`种子` = - -| @ | title | body | -|---|-------|------| -| 1 | hello | first-row | -| 2 | second | card-body | - -*`db` = > web.db url="sqlite:./data/web-demo.db" * -*`articles` = > `db`.init name=articles fields=`articles` * -> `db`.insert table=`articles` rows=`种子` - -*`page` = > web.page title=Demo * -*`page` = > `page`.nav table=`nav` * -*`page` = > `page`.sidebar table=`side` * -*`page` = > `page`.footer table=`foot` * -*`page` = > `page`.main table=`articles` bind=`主体` layout=cards intro="

Marqdo Web

变量名即表名:articles;页面先创建再挂 nav / main。

" * - -*`app` = > web.app page=`page` db=`db` admin=True host=127.0.0.1 port=18080 * -> `app`.static dir=ext/web/templates/starter/static -> print text=listening -> `app`.listen diff --git a/examples/web-site/README.md b/examples/web-site/README.md new file mode 100644 index 0000000..a0e24d5 --- /dev/null +++ b/examples/web-site/README.md @@ -0,0 +1,10 @@ +# examples/web-site + +Canonical English sample for `ext/web` (design §4). + +```bash +cargo build -p marqdo_plugin_web +cargo run -- examples/web-site/index.mq.md +``` + +Then open http://127.0.0.1:18081/ (admin at `/admin`). diff --git a/examples/web-site/components/foot.mq.md b/examples/web-site/components/foot.mq.md new file mode 100644 index 0000000..46d74ce --- /dev/null +++ b/examples/web-site/components/foot.mq.md @@ -0,0 +1,9 @@ +## foot + +`foot` = + +| 属性 | 值 | 样式 | +|------|-----|------| +| Marqdo | https://github.com | | + +**`foot`** diff --git a/examples/web-site/components/nav.mq.md b/examples/web-site/components/nav.mq.md new file mode 100644 index 0000000..f6e9dcf --- /dev/null +++ b/examples/web-site/components/nav.mq.md @@ -0,0 +1,13 @@ +## nav + +Static top links for the shell. + +`nav` = + +| 属性 | 值 | 样式 | +|------|-----|------| +| Home | / | | +| About | /about | | +| Admin | /admin | | + +**`nav`** diff --git a/examples/web-site/components/side.mq.md b/examples/web-site/components/side.mq.md new file mode 100644 index 0000000..f356139 --- /dev/null +++ b/examples/web-site/components/side.mq.md @@ -0,0 +1,10 @@ +## side + +`side` = + +| 属性 | 值 | 样式 | +|------|-----|------| +| Notes | / | | +| Docs | https://github.com | | + +**`side`** diff --git a/examples/web-site/db/articles.mq.md b/examples/web-site/db/articles.mq.md new file mode 100644 index 0000000..471a84a --- /dev/null +++ b/examples/web-site/db/articles.mq.md @@ -0,0 +1,22 @@ +## schema + +`fields` = + +| 字段 | 类型 | 可空 | +|------|------|------| +| id | integer | false | +| title | text | false | +| body | text | true | + +**`fields`** + +## seed + +`rows` = + +| id | title | body | +|----|-------|------| +| 1 | Hello Marqdo | First article from a GFM table. | +| 2 | Code as docs | The page table is the program. | + +**`rows`** diff --git a/examples/web-site/db/index.mq.md b/examples/web-site/db/index.mq.md new file mode 100644 index 0000000..e0ba9be --- /dev/null +++ b/examples/web-site/db/index.mq.md @@ -0,0 +1,20 @@ +--- +title: db/index +description: Open sqlite, init articles, seed once. +> ext/web/web.mq.md +> articles.mq.md as articles +> lib/fs.mq.md +--- + +## open + +*`store` = > web.db url="sqlite:data/site.db" * +*`fields` = > articles.schema * +> `store`.init name=articles fields=`fields` +*`rows` = > `store`.select table=articles limit=1 * +1. `rows` + **`store`** +2. * + *`seed` = > articles.seed * + > `store`.insert table=articles rows=`seed` + **`store`** diff --git a/examples/web-site/index.mq.md b/examples/web-site/index.mq.md new file mode 100644 index 0000000..a55a875 --- /dev/null +++ b/examples/web-site/index.mq.md @@ -0,0 +1,37 @@ +--- +title: web-site +description: Home = page table; main inline; class methods assemble. +> ext/web/web.mq.md +> styles/shell.mq.md +> components/nav.mq.md +> components/side.mq.md +> components/foot.mq.md +> db/articles.mq.md +> db/index.mq.md as db +--- + +# main + +`home` = + +| 组件 | 样式 | +|------|------| +| nav.`nav` | shell.`topnav` | +| side.`side` | shell.`side_panel` | +| foot.`foot` | | + +Main content is not a reusable component, so it is authored here. + +`index` = + +| 属性 | 值 | 样式 | +|------|-----|------| +| `title` | articles.`articles`.title | shell.`card_title` | +| `body` | articles.`articles`.body | shell.`card_body` | + +*`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` * +*`app` = > web.app page=`page` db=`store` admin=True host=127.0.0.1 port=18081 * +> `app`.listen diff --git a/examples/web-site/styles/shell.mq.md b/examples/web-site/styles/shell.mq.md new file mode 100644 index 0000000..15cd41b --- /dev/null +++ b/examples/web-site/styles/shell.mq.md @@ -0,0 +1,42 @@ +## topnav + +`topnav` = + +| 属性 | 值 | +|------|-----| +| background | #ffffff | +| border-bottom | 1px solid #e7e5e4 | + +**`topnav`** + +## side_panel + +`side_panel` = + +| 属性 | 值 | +|------|-----| +| background | #f5f5f4 | + +**`side_panel`** + +## card_title + +`card_title` = + +| 属性 | 值 | +|------|-----| +| font-size | 1.15rem | +| margin | 0 0 0.35rem | + +**`card_title`** + +## card_body + +`card_body` = + +| 属性 | 值 | +|------|-----| +| color | #57534e | +| margin | 0 | + +**`card_body`** diff --git a/ext/web/README.md b/ext/web/README.md index e4585b3..5b4f84d 100644 --- a/ext/web/README.md +++ b/ext/web/README.md @@ -20,3 +20,5 @@ marqdo ext add web ``` Scaffold: `> web.scaffold dest=./myapp` + +Multipage site pack (compose + table CSS + `/_part`): see [`examples/web-site/`](../../examples/web-site/). diff --git a/ext/web/templates/starter/.env.example b/ext/web/templates/starter/.env.example deleted file mode 100644 index 1a38f0a..0000000 --- a/ext/web/templates/starter/.env.example +++ /dev/null @@ -1,10 +0,0 @@ -MARQDO_WEB_HOST=127.0.0.1 -MARQDO_WEB_PORT=8080 -DATABASE_URL=sqlite:./data/app.db -# MARQDO_WEB_ADMIN_USER=admin -# MARQDO_WEB_ADMIN_PASSWORD=change-me -# REDIS_URL=redis://127.0.0.1:6379/0 -# MARQDO_S3_ENDPOINT= -# MARQDO_S3_BUCKET= -# MARQDO_S3_ACCESS_KEY= -# MARQDO_S3_SECRET_KEY= diff --git a/ext/web/templates/starter/app.mq.md b/ext/web/templates/starter/app.mq.md deleted file mode 100644 index b678c47..0000000 --- a/ext/web/templates/starter/app.mq.md +++ /dev/null @@ -1,51 +0,0 @@ ---- -title: ext/web starter app -description: Variable name = table name; page methods bind regions. -> ext/web/web.mq.md ---- - -# main - -> web.load_env path=.env -> web.ensure_plugin - -`nav` = - -| 前端变量 | 后端数据库 | 绑定css样式 | -|----------|------------|-------------| -| 首页 | / | | -| 管理 | /admin | | - -`side` = - -| 前端变量 | 后端数据库 | 绑定css样式 | -|----------|------------|-------------| -| 全部文章 | / | | -| 管理后台 | /admin | | - -`articles` = - -| 字段 | 类型 | 可空 | -|------|------|------| -| id | integer | false | -| title | text | false | -| body | text | true | - -`主体` = - -| 前端变量 | 后端数据库 | 绑定css样式 | -|----------|------------|-------------| -| title | title | card-title | -| body | body | card-body | - -*`db` = > web.db * -*`articles` = > `db`.init name=articles fields=`articles` * - -*`page` = > web.page title=Starter * -*`page` = > `page`.nav table=`nav` * -*`page` = > `page`.sidebar table=`side` * -*`page` = > `page`.main table=`articles` bind=`主体` layout=cards intro="

Starter

" * - -*`app` = > web.app page=`page` db=`db` admin=True * -> `app`.static dir=./static -> `app`.listen diff --git a/ext/web/templates/starter/migrations/001_init.sql b/ext/web/templates/starter/migrations/001_init.sql deleted file mode 100644 index 397e512..0000000 --- a/ext/web/templates/starter/migrations/001_init.sql +++ /dev/null @@ -1,6 +0,0 @@ -CREATE TABLE IF NOT EXISTS posts ( - id INTEGER PRIMARY KEY AUTOINCREMENT, - title TEXT NOT NULL, - body TEXT, - created_at TEXT DEFAULT (datetime('now')) -); diff --git a/ext/web/templates/starter/static/theme.css b/ext/web/templates/starter/static/theme.css deleted file mode 100644 index 16beafb..0000000 --- a/ext/web/templates/starter/static/theme.css +++ /dev/null @@ -1,509 +0,0 @@ -/* Marqdo Web default theme — semantic / classless shell. - Content kinds: prose, cards, table. No purple/cream-terracotta AI defaults. */ - -:root { - --ink: #1c1917; - --ink-muted: #57534e; - --paper: #fafaf9; - --panel: #ffffff; - --line: #e7e5e4; - --accent: #0f766e; - --accent-hover: #0d9488; - --side-w: 14rem; - --radius: 6px; - --font-display: "Source Serif 4", "Noto Serif SC", Georgia, serif; - --font-ui: "IBM Plex Sans", "Noto Sans SC", "Segoe UI", sans-serif; - --font-mono: "IBM Plex Mono", ui-monospace, monospace; - --space: 1.25rem; - --max-prose: 42rem; -} - -* { - box-sizing: border-box; -} - -html { - font-size: 16px; - -webkit-text-size-adjust: 100%; -} - -body { - margin: 0; - min-height: 100vh; - display: grid; - grid-template-rows: auto 1fr auto; - grid-template-columns: 1fr; - background: var(--paper); - color: var(--ink); - font-family: var(--font-ui); - line-height: 1.55; -} - -body.has-sidebar { - grid-template-columns: var(--side-w) 1fr; - grid-template-areas: - "top top" - "side main" - "foot foot"; -} - -body.no-sidebar { - grid-template-areas: - "top" - "main" - "foot"; -} - -/* —— Shell —— */ -header.topnav { - grid-area: top; - background: var(--panel); - border-bottom: 1px solid var(--line); - padding: 0.85rem var(--space); - position: sticky; - top: 0; - z-index: 10; -} - -aside.side { - grid-area: side; - background: #f5f5f4; - border-right: 1px solid var(--line); - padding: var(--space) 1rem; - min-height: 0; -} - -main.main { - grid-area: main; - padding: calc(var(--space) * 1.25) var(--space) calc(var(--space) * 2); - min-width: 0; -} - -footer.foot { - grid-area: foot; - border-top: 1px solid var(--line); - padding: 0.85rem var(--space); - color: var(--ink-muted); - font-size: 0.9rem; - background: var(--panel); -} - -/* —— Nav links —— */ -ul.nav, -ul.side-nav, -ul.foot-nav { - list-style: none; - margin: 0; - padding: 0; - display: flex; - gap: 0.35rem 1.15rem; - flex-wrap: wrap; - align-items: center; -} - -ul.side-nav { - flex-direction: column; - align-items: stretch; - gap: 0.2rem; -} - -aside.side .side-label { - display: block; - font-size: 0.72rem; - letter-spacing: 0.08em; - text-transform: uppercase; - color: var(--ink-muted); - margin: 0 0 0.65rem; - font-family: var(--font-ui); -} - -ul.nav a, -ul.side-nav a, -ul.foot-nav a { - color: var(--ink); - text-decoration: none; - font-weight: 500; - border-radius: var(--radius); - padding: 0.35rem 0.45rem; -} - -ul.side-nav a { - display: block; - padding: 0.45rem 0.6rem; -} - -ul.nav a:hover, -ul.side-nav a:hover, -ul.foot-nav a:hover { - color: var(--accent); - background: rgba(15, 118, 110, 0.08); -} - -ul.side-nav a[aria-current="page"], -ul.nav a[aria-current="page"] { - color: var(--accent); - background: rgba(15, 118, 110, 0.12); -} - -/* —— Prose (intro / raw main HTML) —— */ -.main-intro, -.content.prose { - max-width: var(--max-prose); - font-family: var(--font-display); - font-size: 1.125rem; -} - -.main-intro h1, -.content.prose h1 { - font-size: 2rem; - line-height: 1.2; - margin: 0 0 0.75rem; - letter-spacing: -0.02em; -} - -.main-intro p, -.content.prose p { - margin: 0 0 1rem; - color: var(--ink-muted); -} - -/* Bound field hooks from `|绑定css样式|` */ -.card-title { - font-family: var(--font-display); -} - -.card-body { - color: var(--ink-muted); -} - -.content.cards { - display: grid; - gap: 1rem; - margin-top: 1.25rem; - grid-template-columns: repeat(auto-fill, minmax(16rem, 1fr)); -} - -.content.cards article { - background: var(--panel); - border: 1px solid var(--line); - border-radius: var(--radius); - padding: 1rem 1.1rem; - box-shadow: 0 1px 0 rgba(28, 25, 23, 0.04); -} - -.content.cards article h2 { - font-family: var(--font-display); - font-size: 1.2rem; - margin: 0 0 0.45rem; - line-height: 1.3; -} - -.content.cards article p { - margin: 0; - color: var(--ink-muted); - font-size: 0.95rem; -} - -.content.cards article .meta { - margin-top: 0.65rem; - font-size: 0.8rem; - color: var(--ink-muted); - font-family: var(--font-mono); -} - -/* —— Table layout —— */ -.content.table-wrap { - margin-top: 1.25rem; - overflow-x: auto; - border: 1px solid var(--line); - border-radius: var(--radius); - background: var(--panel); -} - -.content.table-wrap table { - width: 100%; - border-collapse: collapse; - font-size: 0.95rem; -} - -.content.table-wrap th, -.content.table-wrap td { - padding: 0.55rem 0.75rem; - text-align: left; - border-bottom: 1px solid var(--line); -} - -.content.table-wrap th { - background: #f5f5f4; - font-weight: 600; - font-size: 0.8rem; - text-transform: uppercase; - letter-spacing: 0.04em; - color: var(--ink-muted); -} - -.content.table-wrap tr:last-child td { - border-bottom: 0; -} - -/* —— Simple list —— */ -.content.list { - margin: 1.25rem 0 0; - padding: 0; - list-style: none; - max-width: var(--max-prose); -} - -.content.list li { - padding: 0.65rem 0; - border-bottom: 1px solid var(--line); - font-family: var(--font-display); -} - -/* —— Admin panel —— */ -.admin-page { - max-width: 56rem; -} - -.admin-bar { - display: flex; - flex-wrap: wrap; - align-items: flex-end; - justify-content: space-between; - gap: 1rem; - margin-bottom: 1.25rem; - padding-bottom: 1rem; - border-bottom: 1px solid var(--line); -} - -.admin-crumbs { - margin: 0 0 0.25rem; - font-size: 0.8rem; - color: var(--ink-muted); -} - -.admin-crumbs a { - color: var(--ink-muted); - text-decoration: none; -} - -.admin-crumbs a:hover { - color: var(--accent); -} - -.admin-bar h1 { - margin: 0; - font-family: var(--font-display); - font-size: 1.65rem; - letter-spacing: -0.02em; -} - -.admin-actions { - display: flex; - flex-wrap: wrap; - gap: 0.5rem; -} - -.admin-lead { - margin: 0 0 1rem; - color: var(--ink-muted); -} - -.admin-empty { - color: var(--ink-muted); - padding: 1.5rem 0; -} - -.admin-cards { - display: grid; - gap: 1rem; - grid-template-columns: repeat(auto-fill, minmax(14rem, 1fr)); -} - -.admin-card { - background: var(--panel); - border: 1px solid var(--line); - border-radius: var(--radius); - padding: 1rem 1.1rem; -} - -.admin-card h2 { - margin: 0 0 0.35rem; - font-size: 1.15rem; - font-family: var(--font-display); -} - -.admin-meta { - margin: 0 0 0.85rem; - font-size: 0.85rem; - color: var(--ink-muted); - font-family: var(--font-mono); -} - -.admin-card-actions { - display: flex; - gap: 0.45rem; -} - -.btn, -button.btn { - display: inline-flex; - align-items: center; - justify-content: center; - padding: 0.4rem 0.85rem; - border-radius: var(--radius); - border: 1px solid var(--accent); - background: var(--accent); - color: #fff; - font: inherit; - font-size: 0.9rem; - text-decoration: none; - cursor: pointer; -} - -.btn:hover, -button.btn:hover { - background: var(--accent-hover); - border-color: var(--accent-hover); - color: #fff; -} - -.btn-ghost { - background: transparent; - color: var(--ink); - border-color: var(--line); -} - -.btn-ghost:hover { - background: #f5f5f4; - color: var(--ink); - border-color: var(--line); -} - -.btn-danger { - background: #fff; - color: #b91c1c; - border-color: #fecaca; -} - -.btn-danger:hover { - background: #fef2f2; - color: #991b1b; - border-color: #fecaca; -} - -.btn-small { - padding: 0.25rem 0.55rem; - font-size: 0.8rem; -} - -.col-actions { - white-space: nowrap; - width: 1%; -} - -.inline-form { - display: inline; - margin: 0; -} - -.admin-table th.col-actions { - text-align: right; -} - -.admin-table td.col-actions { - text-align: right; -} - -.admin-form { - max-width: 28rem; -} - -.admin-form-fields { - display: grid; - gap: 0.9rem; -} - -.admin-field { - display: grid; - gap: 0.35rem; -} - -.admin-field span { - font-size: 0.85rem; - font-weight: 600; - color: var(--ink-muted); -} - -.admin-field input, -.admin-field textarea { - width: 100%; - padding: 0.5rem 0.65rem; - border: 1px solid var(--line); - border-radius: var(--radius); - font: inherit; - background: var(--panel); - color: var(--ink); -} - -.admin-field input:focus, -.admin-field textarea:focus { - outline: 2px solid color-mix(in srgb, var(--accent) 35%, transparent); - border-color: var(--accent); -} - -.admin-form-footer { - display: flex; - gap: 0.5rem; - margin-top: 1.25rem; -} - -.log-action { - font-family: var(--font-mono); - font-size: 0.85rem; -} - -.log-create { - color: #0f766e; -} - -.log-update { - color: #a16207; -} - -.log-delete { - color: #b91c1c; -} - -aside.side .side-label { - margin-bottom: 0.5rem; -} - -a { - color: var(--accent); -} - -a:hover { - color: var(--accent-hover); -} - -@media (max-width: 720px) { - body.has-sidebar { - grid-template-columns: 1fr; - grid-template-areas: - "top" - "side" - "main" - "foot"; - } - - aside.side { - border-right: 0; - border-bottom: 1px solid var(--line); - } - - ul.side-nav { - flex-direction: row; - flex-wrap: wrap; - } -} diff --git a/ext/web/web.mq.md b/ext/web/web.mq.md index 434838e..dd996d5 100644 --- a/ext/web/web.mq.md +++ b/ext/web/web.mq.md @@ -1,375 +1,175 @@ --- -title: ext/web -description: >- - Dynamic website toolkit. Variable name = table name; page regions bound by methods. +title: ext/web/web +description: Official web site classes (English). Tables + methods; no bag glue. +> lib/plugin.mq.md > lib/sys.mq.md > lib/json.mq.md -> lib/plugin.mq.md -> lib/fs.mq.md --- -## load_env - + `path`=None - -**> sys.load_dotenv path=`path`** - ## ensure_plugin +Load the ABI v2 `web` plugin once. + *`p` = > plugin.native_path name=web * 1. `p` > plugin.load path=`p` 2. * - > print text=web-plugin-missing: cargo build -p marqdo_plugin_web or marqdo ext add web + > print text=ext/web: native web plugin not found (build marqdo_plugin_web or marqdo ext add web) > sys.exit code=1 - ---- - -## as_links - + `table` - -**> web_as_links table=`table`** - -## as_fields - + `table` - -**> web_as_fields table=`table`** - -## as_bind - + `table` - -**> web_as_bind table=`table`** - -## as_rows - + `table` - -**> web_as_rows table=`table`** - -## table_name - + `table` - -*`t` = > type `table` * -1. `t` == map - *`n` = > json.get value=`table` key=name * - 1. `n` - **`n`** - 2. * - **`table`** -2. * - **`table`** - ---- +**** # page - + `theme`=starter - + `title`=Marqdo Web - + `intro`="

Welcome

" - + `layout`=cards - + `db_url`=None - -*`self` = > json.parse text={"_type":"page","theme":"starter","title":"Marqdo Web","intro":"

Welcome

","layout":"cards","slots":{},"nav":[],"sidebar":[],"footer":[]} * -*`self` = > json.set map=`self` key=theme value=`theme` * -*`self` = > json.set map=`self` key=title value=`title` * -*`self` = > json.set map=`self` key=intro value=`intro` * -*`self` = > json.set map=`self` key=layout value=`layout` * -1. `db_url` - *`self` = > json.set map=`self` key=db_url value=`db_url` * -2. * - *`_` = 1* -**`self`** - -## nav - + `table` - -*`b` = > as_bind table=`table` * -*`self` = > json.set map=`self` key=nav value=`b` * -**`self`** - -## sidebar - + `table` - -*`b` = > as_bind table=`table` * -*`self` = > json.set map=`self` key=sidebar value=`b` * -**`self`** - -## footer - + `table` - -*`b` = > as_bind table=`table` * -*`self` = > json.set map=`self` key=footer value=`b` * -**`self`** - -## main - + `table` - + `bind` - + `layout`=cards + + `title`="Marqdo Web" + `intro`="" -*`tn` = > table_name table=`table` * -*`b` = > as_bind table=`bind` * -*`self` = > json.set map=`self` key=table value=`tn` * -*`self` = > json.set map=`self` key=main value=`b` * -*`self` = > json.set map=`self` key=layout value=`layout` * -1. `intro` - *`self` = > json.set map=`self` key=intro value=`intro` * -2. * - *`_` = 1* -**`self`** +> ensure_plugin +**> web_page_new title=`title` intro=`intro`** -## follow - + `name` - + `live` +## compose_components + + `components` -*`slots` = > json.get value=`self` key=slots * -1. `slots` - *`_` = 1* -2. * - *`slots` = > json.parse text={} * -*`slots` = > json.set map=`slots` key=`name` value=`live` * -*`self` = > json.set map=`self` key=slots value=`slots` * -1. `name` == main - *`self` = > json.set map=`self` key=main value=`live` * -2. `name` == 主体 - *`self` = > json.set map=`self` key=main value=`live` * -3. * - *`_` = 1* -**`self`** +Assemble nav / sidebar / footer from a page table (`|组件|样式|` or `|src|style|`). -## resolve_live - + `value` +**> web_compose_components page=`self` components=`components`** -*`t` = > type `value` * -1. `t` == map - *`kind` = > json.get value=`value` key=_type * - 1. `kind` == live - *`url` = > json.get value=`value` key=url * - *`table` = > json.get value=`value` key=table * - *`limit` = > json.get value=`value` key=limit * - 1. `limit` - *`_` = 1* - 2. * - *`limit` = 200* - *`r` = > web_db_all url=`url` table=`table` limit=`limit` * - **> json.get value=`r` key=rows** - 2. * - **`value`** -2. * - **`value`** +## compose_main + + `main` + +Assemble main from a bind table (`|属性|值|样式|` or `|front|back|css|`). + +**> web_compose_main page=`self` main=`main`** ## render + + `db`=None -*`title` = > json.get value=`self` key=title * -*`nav` = > json.get value=`self` key=nav * -*`sidebar` = > json.get value=`self` key=sidebar * -*`footer` = > json.get value=`self` key=footer * -*`intro` = > json.get value=`self` key=intro * -*`layout` = > json.get value=`self` key=layout * -*`db_url` = > json.get value=`self` key=db_url * -*`table` = > json.get value=`self` key=table * -*`main` = > json.get value=`self` key=main * -*`main` = > `self`.resolve_live value=`main` * -**> web_render title=`title` nav=`nav` sidebar=`sidebar` footer=`footer` main=`main` intro=`intro` layout=`layout` db_url=`db_url` table=`table`** +Offline HTML for tests / previews. ---- +1. `db` + *`url` = > json.get value=`db` key=url * + **> web_render page=`self` url=`url`** +2. * + **> web_render page=`self`** + +# style + + `name`="" + +Style tables live as `##` exports in site style modules; compose resolves them by path. + +**`self`** + +## process + + `style`=None + + `name`=None + + `path`=None + +**`self`** # db - + `url`=None + + `url`="sqlite:site.db" -*`u` = `url` * -1. `u` - *`_` = 1* -2. * - *`u` = > sys.env_get name=DATABASE_URL * -1. `u` - *`_` = 1* -2. * - *`u` = sqlite:./data/app.db * -*`self` = > json.parse text={"_type":"db","tables":[]} * -*`self` = > json.set map=`self` key=url value=`u` * -**`self`** +> ensure_plugin +**> web_db_new url=`url`** ## init + `name` + `fields` - + `primary`=id *`url` = > json.get value=`self` key=url * -*`fs` = > as_fields table=`fields` * -*`_` = > web_db_define url=`url` table=`name` fields=`fs` primary=`primary` * -*`tables` = > json.get value=`self` key=tables * -*`tables` = > json.append list=`tables` item=`name` * -*`self` = > json.set map=`self` key=tables value=`tables` * -*`h` = > json.parse text={"_type":"db_table"} * -*`h` = > json.set map=`h` key=name value=`name` * -*`h` = > json.set map=`h` key=url value=`url` * -**`h`** - -## define - + `table` - + `fields` - + `primary`=id - -*`tn` = > table_name table=`table` * -**> `self`.init name=`tn` fields=`fields` primary=`primary`** - -## migrate - + `dir`=migrations - -*`url` = > json.get value=`self` key=url * -**> web_db_migrate url=`url` dir=`dir`** - -## all - + `table` - + `limit`=200 - -*`url` = > json.get value=`self` key=url * -*`tn` = > table_name table=`table` * -*`r` = > web_db_all url=`url` table=`tn` limit=`limit` * -**> json.get value=`r` key=rows** - -## follow - + `table` - + `limit`=200 - -*`url` = > json.get value=`self` key=url * -*`tn` = > table_name table=`table` * -*`live` = > json.parse text={"_type":"live","kind":"table"} * -*`live` = > json.set map=`live` key=url value=`url` * -*`live` = > json.set map=`live` key=table value=`tn` * -*`live` = > json.set map=`live` key=limit value=`limit` * -**`live`** +**> web_db_init url=`url` name=`name` fields=`fields`** ## insert + `table` + `rows` *`url` = > json.get value=`self` key=url * -*`tn` = > table_name table=`table` * -*`rs` = > as_rows table=`rows` * -**> web_db_insert url=`url` table=`tn` rows=`rs`** +**> web_db_insert url=`url` table=`table` rows=`rows`** -## query +## select + + `table` + + `where`=None + + `limit`=200 + +*`url` = > json.get value=`self` key=url * +*`r` = > web_db_select url=`url` table=`table` limit=`limit` * +**> json.get value=`r` key=rows** + +## get + + `table` + + `id` + +*`url` = > json.get value=`self` key=url * +**> web_db_get url=`url` table=`table` id=`id`** + +## update + + `table` + + `id` + + `row` + +*`url` = > json.get value=`self` key=url * +**> web_db_update url=`url` table=`table` id=`id` row=`row`** + +## delete + + `table` + + `id` + +*`url` = > json.get value=`self` key=url * +**> web_db_delete url=`url` table=`table` id=`id`** + +## exec + `sql` + `args`=None *`url` = > json.get value=`self` key=url * -**> web_db_query url=`url` sql=`sql` args=`args`** +**> web_db_exec url=`url` sql=`sql` args=`args`** ---- +# form + + `table`=None + + `action`=insert + + `id`=None -# store +Form API is planned (design §5.5); first trial ships the class shell only. -*`ep` = > sys.env_get name=MARQDO_S3_ENDPOINT * -*`self` = > json.parse text={"_type":"store","ok":false} * -1. `ep` - *`self` = > json.set map=`self` key=ok value=True * - *`self` = > json.set map=`self` key=endpoint value=`ep` * -2. * - *`_` = 1* **`self`** ---- +## fields + + `fields` -# cache - -*`u` = > sys.env_get name=REDIS_URL * -1. `u` - *`_` = 1* -2. * - *`u` = > sys.env_get name=MARQDO_REDIS_URL * -*`self` = > json.parse text={"_type":"cache","ok":false} * -1. `u` - *`self` = > json.set map=`self` key=ok value=True * - *`self` = > json.set map=`self` key=url value=`u` * -2. * - *`_` = 1* **`self`** ---- +## validate + + `rules`=None + + `data` + +**`data`** + +## render + +**""** + +## submit + + `data` + + `db` + +**`data`** # app - + `page`=None + + `page` + `db`=None - + `admin`=True - + `host`=None - + `port`=None + + `admin`=False + + `host`=127.0.0.1 + + `port`=18081 -*`self` = > json.parse text={"_type":"app","static_dir":null,"admin":true} * -*`self` = > json.set map=`self` key=page value=`page` * -*`self` = > json.set map=`self` key=db value=`db` * -*`self` = > json.set map=`self` key=admin value=`admin` * -*`h` = `host` * -1. `h` - *`_` = 1* -2. * - *`h` = > sys.env_get name=MARQDO_WEB_HOST * -1. `h` - *`_` = 1* -2. * - *`h` = 127.0.0.1 * -*`p` = `port` * -1. `p` - *`_` = 1* -2. * - *`p` = > sys.env_get name=MARQDO_WEB_PORT * -1. `p` - *`_` = 1* -2. * - *`p` = 8080 * -*`self` = > json.set map=`self` key=host value=`h` * -*`self` = > json.set map=`self` key=port value=`p` * -**`self`** +> ensure_plugin +**> web_app_new page=`page` db=`db` admin=`admin` host=`host` port=`port`** -## static - + `dir` +## route + + `path` + + `page`=None -*`self` = > json.set map=`self` key=static_dir value=`dir` * **`self`** ## listen - + `duration_ms`=None -*`page` = > json.get value=`self` key=page * -*`db` = > json.get value=`self` key=db * -*`db_url` = None* -*`tables` = > json.parse text=[] * -1. `db` - *`db_url` = > json.get value=`db` key=url * - *`tables` = > json.get value=`db` key=tables * - *`page` = > json.set map=`page` key=db_url value=`db_url` * -2. * - *`_` = 1* -*`host` = > json.get value=`self` key=host * -*`port` = > json.get value=`self` key=port * -*`sd` = > json.get value=`self` key=static_dir * -*`admin` = > json.get value=`self` key=admin * -**> web_listen host=`host` port=`port` page=`page` static_dir=`sd` db_url=`db_url` admin=`admin` admin_tables=`tables` duration_ms=`duration_ms`** +Serve `/`, `/_part/{id}`, and optional `/admin` from the assembled page. ---- - -## scaffold - + `dest` - + `theme`=starter - -*`sep` = > json.parse text={"css":"/static/theme.css","env":"/.env.example","mig":"/migrations/001_init.sql","idx":"/index.mq.md"} * -*`css_s` = > json.get value=`sep` key=css * -*`env_s` = > json.get value=`sep` key=env * -*`mig_s` = > json.get value=`sep` key=mig * -*`idx_s` = > json.get value=`sep` key=idx * -*`css_out` = `dest` + `css_s` * -*`env_out` = `dest` + `env_s` * -*`mig_out` = `dest` + `mig_s` * -*`idx_out` = `dest` + `idx_s` * - -*`theme_src` = "ext/web/templates/starter/static/theme.css" * -*`css` = > fs.read_text path=`theme_src` * -> fs.write_text path=`css_out` text=`css` - -*`env` = "MARQDO_WEB_HOST=127.0.0.1\nMARQDO_WEB_PORT=8080\nDATABASE_URL=sqlite:./data/app.db\n" * -> fs.write_text path=`env_out` text=`env` - -*`mig` = "CREATE TABLE IF NOT EXISTS articles (\n id INTEGER PRIMARY KEY AUTOINCREMENT,\n title TEXT NOT NULL,\n body TEXT,\n created_at TEXT DEFAULT (datetime('now'))\n);\n" * -> fs.write_text path=`mig_out` text=`mig` - -*`app` = > json.parse text="---\n> ext/web/web.mq.md\n---\n\n# main\n\n> web.load_env path=.env\n> web.ensure_plugin\n\n`nav` =\n\n| 前端变量 | 后端数据库 | 绑定css样式 |\n|----------|------------|-------------|\n| 首页 | / | |\n| 管理 | /admin | |\n\n`side` =\n\n| 前端变量 | 后端数据库 | 绑定css样式 |\n|----------|------------|-------------|\n| 全部文章 | / | |\n| 管理后台 | /admin | |\n\n`articles` =\n\n| 字段 | 类型 | 可空 |\n|------|------|------|\n| id | integer | false |\n| title | text | false |\n| body | text | true |\n\n`主体` =\n\n| 前端变量 | 后端数据库 | 绑定css样式 |\n|----------|------------|-------------|\n| title | title | card-title |\n| body | body | card-body |\n\n*`db` = > web.db *\n*`articles` = > `db`.init name=articles fields=`articles` *\n\n*`page` = > web.page title=Starter *\n*`page` = > `page`.nav table=`nav` *\n*`page` = > `page`.sidebar table=`side` *\n*`page` = > `page`.main table=`articles` bind=`主体` layout=cards intro=\"

Starter

\" *\n\n*`app` = > web.app page=`page` db=`db` admin=True *\n> `app`.static dir=./static\n> `app`.listen\n" * -> fs.write_text path=`idx_out` text=`app` -**`dest`** +**> web_listen app=`self`** diff --git a/ext/web/网页.mq.md b/ext/web/网页.mq.md index ac24fa4..2b592d0 100644 --- a/ext/web/网页.mq.md +++ b/ext/web/网页.mq.md @@ -1,73 +1,165 @@ --- -title: ext/web 网页 -description: 动态网站 — 变量名即表名;页面方法挂载导航与主体(中文面)。 -> ext/web/web.mq.md as en +title: ext/web/网页 +description: 官方网站类(中文)。表格 + 方法;不写袋式胶水。 +> lib/plugin.mq.md > lib/sys.mq.md +> lib/json.mq.md --- -## 加载环境 - + `路径`=None - -**> en.load_env path=`路径`** - ## 确保插件 -**> en.ensure_plugin** +加载 ABI v2 `web` 插件。 -## 脚手架 - + `目标` - + `主题`=starter - -**> en.scaffold dest=`目标` theme=`主题`** - -## 链从表 - + `表` - -**> en.as_links table=`表`** - -## 字段从表 - + `表` - -**> en.as_fields table=`表`** - -## 绑定从表 - + `表` - -**> en.as_bind table=`表`** - -## 行从表 - + `表` - -**> en.as_rows table=`表`** +*`p` = > plugin.native_path name=web * +1. `p` + > plugin.load path=`p` +2. * + > print text=ext/web: 未找到原生 web 插件(请 build marqdo_plugin_web 或 marqdo ext add web) + > sys.exit code=1 +**** # 页面 - + `主题`=starter - + `标题`=Marqdo Web - + `引言`="

欢迎

" - + `主体样式`=cards + + `标题`="站点" + + `引言`="" -先创建页面,再用方法挂导航 / 侧栏 / 底栏 / 主体。 +> 确保插件 +**> web_page_new title=`标题` intro=`引言`** -**> en.page theme=`主题` title=`标题` intro=`引言` layout=`主体样式`** +## 组件装配 + + `组件` + +**> web_compose_components page=`self` components=`组件`** + +## 主体装配 + + `主体` + +**> web_compose_main page=`self` main=`主体`** + +## 渲染 + + `数据库`=None + +1. `数据库` + *`url` = > json.get value=`数据库` key=url * + **> web_render page=`self` url=`url`** +2. * + **> web_render page=`self`** + +# 样式 + + `名`="" + +**`self`** + +## 样式处理 + + `样式`=None + + `名`=None + + `路径`=None + +**`self`** # 数据库 - + `地址`=None + + `地址`="sqlite:site.db" -**> en.db url=`地址`** +> 确保插件 +**> web_db_new url=`地址`** -# 对象存储 +## 初始化 + + `名` + + `字段` -**> en.store** +*`url` = > json.get value=`self` key=url * +**> web_db_init url=`url` name=`名` fields=`字段`** -# 缓存 +## 插入 + + `表` + + `行` -**> en.cache** +*`url` = > json.get value=`self` key=url * +**> web_db_insert url=`url` table=`表` rows=`行`** + +## 查询 + + `表` + + `条件`=None + + `上限`=200 + +*`url` = > json.get value=`self` key=url * +*`r` = > web_db_select url=`url` table=`表` limit=`上限` * +**> json.get value=`r` key=rows** + +## 获取 + + `表` + + `id` + +*`url` = > json.get value=`self` key=url * +**> web_db_get url=`url` table=`表` id=`id`** + +## 更新 + + `表` + + `id` + + `行` + +*`url` = > json.get value=`self` key=url * +**> web_db_update url=`url` table=`表` id=`id` row=`行`** + +## 删除 + + `表` + + `id` + +*`url` = > json.get value=`self` key=url * +**> web_db_delete url=`url` table=`表` id=`id`** + +## 执行 + + `sql` + + `参数`=None + +*`url` = > json.get value=`self` key=url * +**> web_db_exec url=`url` sql=`sql` args=`参数`** + +# 表单 + + `表`=None + + `动作`=插入 + + `id`=None + +表单 API 已锁定(设计 §5.5);本试运行仅留类壳。 + +**`self`** + +## 字段 + + `字段` + +**`self`** + +## 校验 + + `规则`=None + + `数据` + +**`数据`** + +## 渲染 + +**""** + +## 提交 + + `数据` + + `数据库` + +**`数据`** # 应用 - + `页面`=None + + `页面` + `数据库`=None - + `后台`=True - + `主机`=None - + `端口`=None + + `后台`=False + + `主机`=127.0.0.1 + + `端口`=18081 -**> en.app page=`页面` db=`数据库` admin=`后台` host=`主机` port=`端口`** +> 确保插件 +**> web_app_new page=`页面` db=`数据库` admin=`后台` host=`主机` port=`端口`** + +## 路由 + + `路径` + + `页面`=None + +**`self`** + +## 监听 + +**> web_listen app=`self`** diff --git a/plugins/web/Cargo.toml b/plugins/web/Cargo.toml index a8336f8..13927d5 100644 --- a/plugins/web/Cargo.toml +++ b/plugins/web/Cargo.toml @@ -3,7 +3,7 @@ name = "marqdo_plugin_web" version = "0.1.0" edition = "2021" license = "Apache-2.0" -description = "Marqdo web plugin (ABI v2 cdylib) — HTTP, SQLite, admin" +description = "Marqdo web plugin (ABI v2) — HTTP, SQLite, page assemble" publish = false [lib] @@ -13,8 +13,6 @@ crate-type = ["cdylib"] [dependencies] serde = { version = "1", features = ["derive"] } serde_json = "1" -tokio = { version = "1", features = ["rt-multi-thread", "macros", "net", "fs", "io-util", "sync", "time", "signal"] } +tokio = { version = "1", features = ["rt-multi-thread", "macros", "net", "sync", "time", "signal"] } axum = "0.8" -tower-http = { version = "0.6", features = ["fs"] } rusqlite = { version = "0.32", features = ["bundled"] } -chrono = { version = "0.4", default-features = false, features = ["clock", "std"] } diff --git a/plugins/web/src/compose.rs b/plugins/web/src/compose.rs new file mode 100644 index 0000000..022e031 --- /dev/null +++ b/plugins/web/src/compose.rs @@ -0,0 +1,180 @@ +//! Page assemble: compose_components / compose_main. + +use serde_json::{json, Map, Value}; + +use crate::table::{ + as_bind, as_compose, as_css_named, bind_table_name, normalize_ref, normalize_slot, + parse_site_path, SitePath, +}; + +pub fn compose_components( + page: &Value, + layout: &Value, + mut call_lib: impl FnMut(&str) -> Result, +) -> Result { + let mut obj = page.as_object().cloned().unwrap_or_default(); + let rows = as_compose(layout); + let mut css = obj + .get("styles_css") + .and_then(|v| v.as_str()) + .unwrap_or("") + .to_string(); + let mut slot_class = obj + .get("slot_class") + .and_then(|v| v.as_object()) + .cloned() + .unwrap_or_default(); + let mut parts = Map::new(); + let mut compose_out = Vec::new(); + + for row in rows.as_array().cloned().unwrap_or_default() { + let src_raw = row.get("src").and_then(|v| v.as_str()).unwrap_or(""); + let style_raw = row.get("style").and_then(|v| v.as_str()).unwrap_or(""); + if src_raw.is_empty() { + continue; + } + let (name, bind_table) = match parse_site_path(src_raw) { + SitePath::LibMember { lib, member } => { + let t = call_lib(&format!("{lib}.{member}"))?; + (member, t) + } + SitePath::Plain(s) => { + let t = call_lib(&format!("{s}.{s}"))?; + (s, t) + } + SitePath::DbField { .. } => { + return Err(format!("component cell cannot be a db field: {src_raw}")); + } + }; + let slot = normalize_slot(&name); + let style_name = if style_raw.is_empty() { + String::new() + } else { + match parse_site_path(style_raw) { + SitePath::LibMember { lib, member } => { + let st = call_lib(&format!("{lib}.{member}"))?; + css.push_str(&as_css_named(&member, &st)); + member + } + SitePath::Plain(s) => s, + SitePath::DbField { .. } => normalize_ref(style_raw), + } + }; + let binds = as_bind(&bind_table); + match slot.as_str() { + "nav" => obj.insert("nav".into(), binds.clone()), + "sidebar" => obj.insert("sidebar".into(), binds.clone()), + "footer" => obj.insert("footer".into(), binds.clone()), + _ => obj.insert("main".into(), binds.clone()), + }; + if !style_name.is_empty() { + slot_class.insert(slot.clone(), json!(style_name)); + } + compose_out.push(json!({ "src": name, "style": style_name, "slot": slot })); + + let mut part = Map::new(); + part.insert("_type".into(), json!("page")); + part.insert("slot".into(), json!(slot)); + part.insert("fragment".into(), json!(slot)); + match slot.as_str() { + "nav" => { + part.insert("nav".into(), binds); + } + "sidebar" => { + part.insert("sidebar".into(), binds); + } + "footer" => { + part.insert("footer".into(), binds); + } + _ => { + part.insert("main".into(), binds); + } + } + parts.insert(name, Value::Object(part)); + } + + obj.insert("compose".into(), Value::Array(compose_out)); + if !css.is_empty() { + obj.insert("styles_css".into(), json!(css)); + } + if !slot_class.is_empty() { + obj.insert("slot_class".into(), Value::Object(slot_class)); + } + if !parts.is_empty() { + obj.insert("parts".into(), Value::Object(parts)); + } + Ok(Value::Object(obj)) +} + +pub fn compose_main( + page: &Value, + main_table: &Value, + mut call_lib: impl FnMut(&str) -> Result, +) -> Result { + let mut obj = page.as_object().cloned().unwrap_or_default(); + let raw = as_bind(main_table); + let arr = raw.as_array().cloned().unwrap_or_default(); + let mut binds = Vec::new(); + let mut css = obj + .get("styles_css") + .and_then(|v| v.as_str()) + .unwrap_or("") + .to_string(); + + for b in arr { + let front = b + .get("front") + .and_then(|v| v.as_str()) + .unwrap_or("") + .to_string(); + let back_raw = b.get("back").and_then(|v| v.as_str()).unwrap_or(""); + let css_raw = b.get("css").and_then(|v| v.as_str()).unwrap_or(""); + + let back = match parse_site_path(back_raw) { + SitePath::DbField { table, field } => format!("{table}.{field}"), + SitePath::Plain(s) => s, + SitePath::LibMember { lib, member } => { + let v = call_lib(&format!("{lib}.{member}"))?; + match v { + Value::String(s) => s, + other => other.to_string(), + } + } + }; + let css_name = match parse_site_path(css_raw) { + SitePath::LibMember { lib, member } => { + let st = call_lib(&format!("{lib}.{member}"))?; + css.push_str(&as_css_named(&member, &st)); + member + } + SitePath::Plain(s) => s, + SitePath::DbField { .. } => normalize_ref(css_raw), + }; + binds.push(json!({ "front": front, "back": back, "css": css_name })); + } + + if let Some(t) = bind_table_name(&binds) { + obj.insert("table".into(), json!(t)); + } + obj.insert("main".into(), Value::Array(binds.clone())); + if !css.is_empty() { + obj.insert("styles_css".into(), json!(css)); + } + + let mut parts = obj + .get("parts") + .and_then(|v| v.as_object()) + .cloned() + .unwrap_or_default(); + let mut part = Map::new(); + part.insert("_type".into(), json!("page")); + part.insert("slot".into(), json!("main")); + part.insert("fragment".into(), json!("main")); + part.insert("main".into(), Value::Array(binds)); + if let Some(intro) = obj.get("intro") { + part.insert("intro".into(), intro.clone()); + } + parts.insert("index".into(), Value::Object(part)); + obj.insert("parts".into(), Value::Object(parts)); + Ok(Value::Object(obj)) +} diff --git a/plugins/web/src/db.rs b/plugins/web/src/db.rs index bfa338b..7756421 100644 --- a/plugins/web/src/db.rs +++ b/plugins/web/src/db.rs @@ -1,782 +1,288 @@ -//! SQLite helpers: open, migrate, define, CRUD. +//! SQLite helpers for `# db` CRUD (`init` / `insert` / `select` / `get` / `update` / `delete` / `exec`). -use std::fs; -use std::path::{Path, PathBuf}; - -use rusqlite::{params_from_iter, Connection, ToSql}; +use rusqlite::{types::ValueRef, Connection, OptionalExtension, params_from_iter}; use serde_json::{json, Map, Value}; +use std::path::PathBuf; -fn resolve_sqlite_path(url: &str) -> Result { - let u = url.trim(); - let path = if let Some(rest) = u.strip_prefix("sqlite:") { - let rest = rest.trim(); - if let Some(r) = rest.strip_prefix("///") { - // sqlite:///abs/path - format!("/{r}") - } else if rest.starts_with('/') { - // sqlite:/abs/path - rest.to_string() - } else { - rest.trim_start_matches("./").to_string() - } - } else if u.starts_with("postgres://") || u.starts_with("postgresql://") { - return Err("postgres not enabled in this build (W4); use sqlite: URL".into()); - } else { - u.to_string() - }; - let p = PathBuf::from(if path.is_empty() { - "./data/app.db" - } else { - &path - }); - if let Some(parent) = p.parent() { +fn open(url: &str) -> Result { + let path = url + .strip_prefix("sqlite:") + .or_else(|| url.strip_prefix("SQLITE:")) + .unwrap_or(url); + if let Some(parent) = PathBuf::from(path).parent() { if !parent.as_os_str().is_empty() { - fs::create_dir_all(parent).map_err(|e| format!("create db dir: {e}"))?; + std::fs::create_dir_all(parent).map_err(|e| e.to_string())?; } } - Ok(p) + let conn = Connection::open(path).map_err(|e| e.to_string())?; + conn.execute_batch("PRAGMA foreign_keys = ON;") + .map_err(|e| e.to_string())?; + Ok(conn) } -pub fn open_db(url: &str) -> Result { - let path = resolve_sqlite_path(url)?; - Connection::open(&path).map_err(|e| format!("open db {}: {e}", path.display())) -} - -fn ident_ok(s: &str) -> bool { - !s.is_empty() - && s.chars() +fn ident(s: &str) -> Result<&str, String> { + let s = s.trim(); + if s.is_empty() + || !s + .chars() .all(|c| c.is_ascii_alphanumeric() || c == '_') -} - -fn quote_ident(s: &str) -> Result { - if !ident_ok(s) { - return Err(format!("invalid identifier `{s}`")); + { + return Err(format!("bad identifier `{s}`")); } - Ok(format!("\"{s}\"")) + Ok(s) } fn sql_type(t: &str) -> &'static str { match t.trim().to_ascii_lowercase().as_str() { - "int" | "integer" | "bigint" => "INTEGER", - "bool" | "boolean" => "INTEGER", + "int" | "integer" => "INTEGER", "real" | "float" | "double" => "REAL", - "timestamp" | "datetime" => "TEXT", + "blob" => "BLOB", _ => "TEXT", } } -/// Ensure migrations table and apply `*.sql` files in `dir` (sorted). -pub fn migrate(url: &str, dir: &str) -> Result { - let conn = open_db(url)?; - conn.execute_batch( - "CREATE TABLE IF NOT EXISTS _marqdo_migrations ( - id TEXT PRIMARY KEY, - applied_at TEXT NOT NULL - );", - ) - .map_err(|e| format!("ensure migrations table: {e}"))?; - - let dir = Path::new(dir); - if !dir.is_dir() { - return Ok(json!({ "ok": true, "applied": [], "note": "no migrations dir" })); +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(), } - let mut files: Vec<_> = fs::read_dir(dir) - .map_err(|e| format!("read migrations: {e}"))? - .flatten() - .map(|e| e.path()) - .filter(|p| p.extension().and_then(|e| e.to_str()) == Some("sql")) - .collect(); - files.sort(); - - let mut applied = Vec::new(); - for path in files { - let id = path - .file_name() - .map(|s| s.to_string_lossy().into_owned()) - .unwrap_or_default(); - let already: bool = conn - .query_row( - "SELECT 1 FROM _marqdo_migrations WHERE id = ?1", - [&id], - |_| Ok(true), - ) - .unwrap_or(false); - if already { - continue; - } - let sql = fs::read_to_string(&path).map_err(|e| format!("read {}: {e}", path.display()))?; - conn.execute_batch(&sql) - .map_err(|e| format!("migrate {id}: {e}"))?; - let now = chrono::Utc::now().to_rfc3339(); - conn.execute( - "INSERT INTO _marqdo_migrations (id, applied_at) VALUES (?1, ?2)", - [&id, &now], - ) - .map_err(|e| format!("record migration: {e}"))?; - applied.push(Value::String(id)); - } - Ok(json!({ "ok": true, "applied": applied })) } -/// Create table from field list (list of maps: name, type, null, default, unique). -pub fn define_table(url: &str, table: &str, fields: &Value, primary: &str) -> Result { - let table_q = quote_ident(table)?; - let primary = if primary.is_empty() { "id" } else { primary }; - let rows = match fields { - Value::Array(a) => a.clone(), - _ => return Err("fields must be a list of maps".into()), - }; - let mut cols = Vec::new(); - for row in &rows { - let name = row +fn to_sql(v: &Value) -> rusqlite::types::Value { + match v { + Value::Null => rusqlite::types::Value::Null, + Value::Bool(b) => rusqlite::types::Value::Integer(if *b { 1 } else { 0 }), + Value::Number(n) => { + if let Some(i) = n.as_i64() { + rusqlite::types::Value::Integer(i) + } else if let Some(f) = n.as_f64() { + rusqlite::types::Value::Real(f) + } else { + rusqlite::types::Value::Text(n.to_string()) + } + } + Value::String(s) => { + let t = s.trim(); + if let Ok(i) = t.parse::() { + rusqlite::types::Value::Integer(i) + } else if let Ok(f) = t.parse::() { + if !t.contains('e') && !t.contains('E') && t.contains('.') { + rusqlite::types::Value::Real(f) + } else { + rusqlite::types::Value::Text(s.clone()) + } + } else { + rusqlite::types::Value::Text(s.clone()) + } + } + other => rusqlite::types::Value::Text(other.to_string()), + } +} + +fn from_sql(v: ValueRef<'_>) -> Value { + match v { + ValueRef::Null => Value::Null, + ValueRef::Integer(i) => json!(i), + ValueRef::Real(f) => json!(f), + ValueRef::Text(t) => Value::String(String::from_utf8_lossy(t).into_owned()), + ValueRef::Blob(b) => Value::String(format!("blob:{}b", b.len())), + } +} + +/// `fields` = list of {name,type,nullable?} or columnar schema table already normalized. +pub fn init(url: &str, table: &str, fields: &Value) -> Result { + let table = ident(table)?; + let cols = crate::table::as_fields(fields); + let arr = cols.as_array().ok_or("fields must be a list")?; + if arr.is_empty() { + return Err("empty fields".into()); + } + let mut parts = Vec::new(); + let mut has_pk = false; + for c in arr { + let name = c .get("name") - .or_else(|| row.get("名")) - .and_then(|v| v.as_str()) - .ok_or_else(|| "field missing name".to_string())?; - let ty = row + .or_else(|| c.get("字段")) + .map(cell_str) + .unwrap_or_default(); + let name = ident(&name)?; + let ty = c .get("type") - .or_else(|| row.get("类型")) - .and_then(|v| v.as_str()) - .unwrap_or("text"); - let nullable = row - .get("null") - .or_else(|| row.get("可空")) - .and_then(|v| v.as_bool()) + .or_else(|| c.get("类型")) + .map(cell_str) + .unwrap_or_else(|| "text".into()); + let nullable = c + .get("nullable") + .or_else(|| c.get("可空")) + .and_then(|v| match v { + Value::Bool(b) => Some(*b), + Value::String(s) => Some(matches!(s.as_str(), "true" | "True" | "1" | "是" | "可")), + _ => None, + }) .unwrap_or(true); - let unique = row - .get("unique") - .and_then(|v| v.as_bool()) - .unwrap_or(false); - let name_q = quote_ident(name)?; - let mut col = format!("{name_q} {}", sql_type(ty)); - if name == primary { + let mut col = format!("\"{name}\" {}", sql_type(&ty)); + if name == "id" && !has_pk { col.push_str(" PRIMARY KEY"); - if sql_type(ty) == "INTEGER" { + if sql_type(&ty) == "INTEGER" { col.push_str(" AUTOINCREMENT"); } + has_pk = true; } else if !nullable { col.push_str(" NOT NULL"); } - if unique && name != primary { - col.push_str(" UNIQUE"); - } - if let Some(def) = row.get("default").or_else(|| row.get("默认")) { - if let Some(s) = def.as_str() { - if s.eq_ignore_ascii_case("now") { - col.push_str(" DEFAULT (datetime('now'))"); - } else if s == "false" { - col.push_str(" DEFAULT 0"); - } else if s == "true" { - col.push_str(" DEFAULT 1"); - } else { - col.push_str(&format!(" DEFAULT '{s}'")); - } - } else if let Some(b) = def.as_bool() { - col.push_str(if b { " DEFAULT 1" } else { " DEFAULT 0" }); - } else if let Some(n) = def.as_i64() { - col.push_str(&format!(" DEFAULT {n}")); - } - } - cols.push(col); - } - if cols.is_empty() { - return Err("no fields".into()); + parts.push(col); } let sql = format!( - "CREATE TABLE IF NOT EXISTS {table_q} ({});", - cols.join(", ") + "CREATE TABLE IF NOT EXISTS \"{table}\" ({})", + parts.join(", ") ); - let conn = open_db(url)?; - conn.execute_batch(&sql) - .map_err(|e| format!("define table: {e}"))?; - Ok(json!({ "ok": true, "table": table, "sql": sql })) + let conn = open(url)?; + conn.execute_batch(&sql).map_err(|e| e.to_string())?; + Ok(json!({ "_type": "db_table", "name": table, "url": url })) } -fn row_values( - row: &rusqlite::Row<'_>, - names: &[String], -) -> Result { - let mut map = Map::new(); - for (i, name) in names.iter().enumerate() { - let v: Value = match row.get_ref(i).map_err(|e| e.to_string())? { - rusqlite::types::ValueRef::Null => Value::Null, - rusqlite::types::ValueRef::Integer(n) => json!(n), - rusqlite::types::ValueRef::Real(f) => json!(f), - rusqlite::types::ValueRef::Text(t) => { - Value::String(String::from_utf8_lossy(t).into_owned()) - } - rusqlite::types::ValueRef::Blob(b) => { - Value::String(format!("blob:{}bytes", b.len())) - } - }; - map.insert(name.clone(), v); - } - Ok(Value::Object(map)) -} - -pub fn query_all(url: &str, table: &str, limit: i64) -> Result { - let table_q = quote_ident(table)?; - let lim = if limit <= 0 { 200 } else { limit.min(2000) }; - let conn = open_db(url)?; - let sql = format!("SELECT * FROM {table_q} LIMIT {lim}"); - let mut stmt = conn.prepare(&sql).map_err(|e| e.to_string())?; - let names: Vec = (0..stmt.column_count()) - .map(|i| stmt.column_name(i).unwrap_or("?").to_string()) - .collect(); - let mut rows = stmt.query([]).map_err(|e| e.to_string())?; - let mut out = Vec::new(); - while let Some(row) = rows.next().map_err(|e| e.to_string())? { - out.push(row_values(row, &names)?); - } - Ok(json!({ "rows": out, "count": out.len() })) -} - -pub fn exec_sql(url: &str, sql: &str, args: Option<&Value>) -> Result { - let conn = open_db(url)?; - let bind = json_args(args)?; - let refs: Vec<&dyn ToSql> = bind.iter().map(|v| v as &dyn ToSql).collect(); - let n = conn - .execute(sql, params_from_iter(refs)) - .map_err(|e| format!("exec: {e}"))?; - Ok(json!({ "ok": true, "changes": n })) -} - -pub fn query_sql(url: &str, sql: &str, args: Option<&Value>) -> Result { - let conn = open_db(url)?; - let bind = json_args(args)?; - let mut stmt = conn.prepare(sql).map_err(|e| e.to_string())?; - let names: Vec = (0..stmt.column_count()) - .map(|i| stmt.column_name(i).unwrap_or("?").to_string()) - .collect(); - let refs: Vec<&dyn ToSql> = bind.iter().map(|v| v as &dyn ToSql).collect(); - let mut rows = stmt - .query(params_from_iter(refs)) - .map_err(|e| e.to_string())?; - let mut out = Vec::new(); - while let Some(row) = rows.next().map_err(|e| e.to_string())? { - let mut map = Map::new(); - for (i, name) in names.iter().enumerate() { - let v: Value = match row.get_ref(i).map_err(|e| e.to_string())? { - rusqlite::types::ValueRef::Null => Value::Null, - rusqlite::types::ValueRef::Integer(n) => json!(n), - rusqlite::types::ValueRef::Real(f) => json!(f), - rusqlite::types::ValueRef::Text(t) => { - Value::String(String::from_utf8_lossy(t).into_owned()) - } - rusqlite::types::ValueRef::Blob(b) => { - Value::String(format!("blob:{}bytes", b.len())) - } - }; - map.insert(name.clone(), v); - } - out.push(Value::Object(map)); - } - Ok(json!({ "rows": out, "count": out.len() })) -} - -enum SqlVal { - Null, - Int(i64), - Real(f64), - Text(String), -} - -impl ToSql for SqlVal { - fn to_sql(&self) -> rusqlite::Result> { - Ok(match self { - SqlVal::Null => rusqlite::types::ToSqlOutput::Owned(rusqlite::types::Value::Null), - SqlVal::Int(n) => rusqlite::types::ToSqlOutput::Owned(rusqlite::types::Value::Integer(*n)), - SqlVal::Real(f) => rusqlite::types::ToSqlOutput::Owned(rusqlite::types::Value::Real(*f)), - SqlVal::Text(s) => { - rusqlite::types::ToSqlOutput::Owned(rusqlite::types::Value::Text(s.clone())) - } - }) - } -} - -fn json_args(args: Option<&Value>) -> Result, String> { - let Some(v) = args else { - return Ok(Vec::new()); - }; - let arr = v - .as_array() - .ok_or_else(|| "args must be a JSON array".to_string())?; - let mut out = Vec::new(); - for a in arr { - out.push(match a { - Value::Null => SqlVal::Null, - Value::Bool(b) => SqlVal::Int(if *b { 1 } else { 0 }), - Value::Number(n) => { - if let Some(i) = n.as_i64() { - SqlVal::Int(i) - } else if let Some(f) = n.as_f64() { - SqlVal::Real(f) - } else { - SqlVal::Text(n.to_string()) - } - } - Value::String(s) => SqlVal::Text(s.clone()), - other => SqlVal::Text(other.to_string()), - }); - } - Ok(out) -} - -pub fn insert_row(url: &str, table: &str, row: &Value) -> Result { - let obj = row - .as_object() - .ok_or_else(|| "row must be a map".to_string())?; - let table_q = quote_ident(table)?; - let mut cols = Vec::new(); - let mut placeholders = Vec::new(); - let mut vals = Vec::new(); - for (k, v) in obj { - if !ident_ok(k) { - return Err(format!("bad column `{k}`")); - } - cols.push(format!("\"{k}\"")); - placeholders.push("?"); - vals.push(v.clone()); - } - if cols.is_empty() { - return Err("empty row".into()); - } - let sql = format!( - "INSERT INTO {table_q} ({}) VALUES ({})", - cols.join(", "), - placeholders.join(", ") - ); - let r = exec_sql(url, &sql, Some(&Value::Array(vals)))?; - let _ = admin_log(url, "create", table, None, Some(row)); - Ok(r) -} - -/// Insert many rows from `as_rows` output. -pub fn insert_rows(url: &str, table: &str, rows: &Value) -> Result { - let arr = rows - .as_array() - .ok_or_else(|| "rows must be an array".to_string())?; - let mut n = 0; +pub fn insert(url: &str, table: &str, rows: &Value) -> Result { + let table = ident(table)?; + let rows = crate::table::as_rows(rows); + let arr = rows.as_array().ok_or("rows must be a list")?; + let conn = open(url)?; + let mut n = 0i64; for row in arr { - insert_row(url, table, row)?; + let obj = row.as_object().ok_or("row must be a map")?; + let mut cols = Vec::new(); + let mut placeholders = Vec::new(); + let mut vals = Vec::new(); + for (k, v) in obj { + if k == "@" || k == "行" || k == "row" { + continue; + } + let _ = ident(k)?; + cols.push(format!("\"{k}\"")); + placeholders.push("?"); + vals.push(to_sql(v)); + } + if cols.is_empty() { + continue; + } + let sql = format!( + "INSERT INTO \"{table}\" ({}) VALUES ({})", + cols.join(", "), + placeholders.join(", ") + ); + conn.execute(&sql, params_from_iter(vals.iter().cloned())) + .map_err(|e| e.to_string())?; n += 1; } Ok(json!({ "ok": true, "inserted": n })) } -pub fn get_row(url: &str, table: &str, id: &str) -> Result { - let table_q = quote_ident(table)?; - let conn = open_db(url)?; - let sql = format!("SELECT * FROM {table_q} WHERE \"id\" = ?1 LIMIT 1"); +pub fn select(url: &str, table: &str, limit: i64) -> Result { + let table = ident(table)?; + let conn = open(url)?; + let sql = format!("SELECT * FROM \"{table}\" LIMIT ?1"); let mut stmt = conn.prepare(&sql).map_err(|e| e.to_string())?; let names: Vec = (0..stmt.column_count()) .map(|i| stmt.column_name(i).unwrap_or("?").to_string()) .collect(); - let mut rows = stmt.query(rusqlite::params![id]).map_err(|e| e.to_string())?; - let Some(row) = rows.next().map_err(|e| e.to_string())? else { - return Err(format!("row id={id} not found")); - }; - row_values(row, &names) + let mut rows = Vec::new(); + let mut rows_iter = stmt + .query(rusqlite::params![limit]) + .map_err(|e| e.to_string())?; + while let Some(r) = rows_iter.next().map_err(|e| e.to_string())? { + let mut m = Map::new(); + for (i, name) in names.iter().enumerate() { + m.insert(name.clone(), from_sql(r.get_ref(i).map_err(|e| e.to_string())?)); + } + rows.push(Value::Object(m)); + } + Ok(json!({ "rows": rows })) } -pub fn update_row(url: &str, table: &str, id: &str, row: &Value) -> Result { - let obj = row - .as_object() - .ok_or_else(|| "row must be a map".to_string())?; - let table_q = quote_ident(table)?; +pub fn get(url: &str, table: &str, id: &str) -> Result { + let table = ident(table)?; + let conn = open(url)?; + let sql = format!("SELECT * FROM \"{table}\" WHERE \"id\" = ?1 LIMIT 1"); + let mut stmt = conn.prepare(&sql).map_err(|e| e.to_string())?; + let names: Vec = (0..stmt.column_count()) + .map(|i| stmt.column_name(i).unwrap_or("?").to_string()) + .collect(); + let row = stmt + .query_row(rusqlite::params![id], |r| { + let mut m = Map::new(); + for (i, name) in names.iter().enumerate() { + m.insert(name.clone(), from_sql(r.get_ref(i)?)); + } + Ok(Value::Object(m)) + }) + .optional() + .map_err(|e| e.to_string())?; + Ok(row.unwrap_or(Value::Null)) +} + +pub fn update(url: &str, table: &str, id: &str, row: &Value) -> Result { + let table = ident(table)?; + let obj = row.as_object().ok_or("row must be a map")?; let mut sets = Vec::new(); let mut vals = Vec::new(); for (k, v) in obj { - if k == "id" || !ident_ok(k) { + if k == "id" { continue; } + let _ = ident(k)?; sets.push(format!("\"{k}\" = ?")); - vals.push(v.clone()); + vals.push(to_sql(v)); } if sets.is_empty() { return Err("nothing to update".into()); } - vals.push(json!(id)); + vals.push(rusqlite::types::Value::Text(id.to_string())); let sql = format!( - "UPDATE {table_q} SET {} WHERE \"id\" = ?", + "UPDATE \"{table}\" SET {} WHERE \"id\" = ?", sets.join(", ") ); - let r = exec_sql(url, &sql, Some(&Value::Array(vals)))?; - let _ = admin_log(url, "update", table, Some(id), Some(row)); - Ok(r) + let conn = open(url)?; + let n = conn + .execute(&sql, params_from_iter(vals.iter().cloned())) + .map_err(|e| e.to_string())?; + Ok(json!({ "ok": true, "updated": n })) } -pub fn delete_row(url: &str, table: &str, id: &str) -> Result { - let table_q = quote_ident(table)?; - let sql = format!("DELETE FROM {table_q} WHERE \"id\" = ?"); - let r = exec_sql(url, &sql, Some(&json!([id])))?; - let _ = admin_log(url, "delete", table, Some(id), None); - Ok(r) +pub fn delete(url: &str, table: &str, id: &str) -> Result { + let table = ident(table)?; + let conn = open(url)?; + let sql = format!("DELETE FROM \"{table}\" WHERE \"id\" = ?1"); + let n = conn + .execute(&sql, rusqlite::params![id]) + .map_err(|e| e.to_string())?; + Ok(json!({ "ok": true, "deleted": n })) } -pub fn ensure_admin_log(url: &str) -> Result<(), String> { - let conn = open_db(url)?; - conn.execute_batch( - "CREATE TABLE IF NOT EXISTS _marqdo_admin_log ( - id INTEGER PRIMARY KEY AUTOINCREMENT, - at TEXT NOT NULL DEFAULT (datetime('now')), - action TEXT NOT NULL, - table_name TEXT NOT NULL, - row_id TEXT, - detail TEXT - );", - ) - .map_err(|e| format!("ensure admin log: {e}"))?; - Ok(()) +pub fn exec(url: &str, sql: &str, args: Option<&Value>) -> Result { + let conn = open(url)?; + let vals: Vec = match args { + Some(Value::Array(a)) => a.iter().map(to_sql).collect(), + _ => Vec::new(), + }; + let n = conn + .execute(sql, params_from_iter(vals.iter().cloned())) + .map_err(|e| e.to_string())?; + Ok(json!({ "ok": true, "changes": n })) } -pub fn admin_log( - url: &str, - action: &str, - table: &str, - row_id: Option<&str>, - detail: Option<&Value>, -) -> Result<(), String> { - ensure_admin_log(url)?; - let detail_s = detail - .map(|v| v.to_string()) - .unwrap_or_default(); - exec_sql( - url, - "INSERT INTO _marqdo_admin_log (action, table_name, row_id, detail) VALUES (?, ?, ?, ?)", - Some(&json!([action, table, row_id.unwrap_or(""), detail_s])), - )?; - Ok(()) -} - -/// User tables for admin (skip sqlite_* and _marqdo_*). -pub fn list_user_tables(url: &str) -> Result, String> { - let conn = open_db(url)?; +pub fn list_tables(url: &str) -> Result, String> { + let conn = open(url)?; let mut stmt = conn .prepare( - "SELECT name FROM sqlite_master - WHERE type='table' - AND name NOT LIKE 'sqlite_%' - AND name NOT LIKE '_marqdo_%' - ORDER BY name", + "SELECT name FROM sqlite_master WHERE type='table' AND name NOT LIKE 'sqlite_%' AND name NOT LIKE '_marqdo%' ORDER BY name", ) - .map_err(|e| format!("list tables: {e}"))?; + .map_err(|e| e.to_string())?; let rows = stmt .query_map([], |r| r.get::<_, String>(0)) - .map_err(|e| format!("list tables query: {e}"))?; - let mut out = Vec::new(); - for r in rows { - out.push(r.map_err(|e| format!("list tables row: {e}"))?); - } - Ok(out) -} - -/// Column names via PRAGMA table_info. -pub fn table_columns(url: &str, table: &str) -> Result, String> { - if !ident_ok(table) { - return Err(format!("bad table `{table}`")); - } - let conn = open_db(url)?; - let mut stmt = conn - .prepare(&format!("PRAGMA table_info(\"{table}\")")) - .map_err(|e| format!("pragma: {e}"))?; - let rows = stmt - .query_map([], |r| r.get::<_, String>(1)) - .map_err(|e| format!("pragma map: {e}"))?; - let mut out = Vec::new(); - for r in rows { - out.push(r.map_err(|e| format!("pragma row: {e}"))?); - } - Ok(out) -} - -fn admin_shell(title: &str, body: &str, tables: &[String], current: Option<&str>) -> String { - let mut side = Vec::new(); - side.push(json!({"label": "Dashboard", "href": "/admin"})); - for t in tables { - let label = if current == Some(t.as_str()) { - format!("· {t}") - } else { - t.clone() - }; - side.push(json!({"label": label, "href": format!("/admin/{t}")})); - } - side.push(json!({"label": "Log", "href": "/admin/log"})); - crate::page::render_page(&json!({ - "title": title, - "nav": [ - {"label": "Site", "href": "/"}, - {"label": "Admin", "href": "/admin"}, - {"label": "Log", "href": "/admin/log"} - ], - "sidebar": side, - "intro": body, - })) -} - -fn admin_bar(title: &str, crumbs: &str, actions: &str) -> String { - format!( - "
\ -
\ -
\ -

{crumbs}

\ -

{title}

\ -
\ -
{actions}
\ -
" - ) -} - -fn cell_display(v: &Value) -> String { - match v { - Value::String(s) => s.clone(), - Value::Null => String::new(), - other => other.to_string(), - } -} - -pub fn admin_home_html(url: Option<&str>, tables: &[String]) -> String { - let count = tables.len(); - let actions = "View log"; - let mut html = admin_bar("Dashboard", "Admin", actions); - html.push_str(&format!( - "

{count} table(s) in the database.

" - )); - if tables.is_empty() { - html.push_str( - "

No user tables yet. Define one with db.init.

", - ); - } else { - html.push_str("
"); - for t in tables { - let t_e = crate::page::html_escape(t); - let n = url - .and_then(|u| query_all(u, t, 200).ok()) - .and_then(|d| d.get("count").and_then(|v| v.as_u64())) - .unwrap_or(0); - html.push_str(&format!( - "
\ -

{t_e}

\ -

{n} rows

\ -
\ - Open\ - New\ -
\ -
" - )); - } - html.push_str("
"); - } - html.push_str("
"); - admin_shell("Admin", &html, tables, None) -} - -pub fn admin_list_html(url: &str, table: &str) -> Result { - let tables = list_user_tables(url).unwrap_or_default(); - let cols = table_columns(url, table)?; - let data = query_all(url, table, 200)?; - let rows = data - .get("rows") - .and_then(|v| v.as_array()) - .cloned() - .unwrap_or_default(); - let t = crate::page::html_escape(table); - let actions = format!("New row"); - let mut html = admin_bar( - table, - &format!("Admin / {t}"), - &actions, - ); - let headers = if cols.is_empty() { - rows.first() - .and_then(|r| r.as_object()) - .map(|m| m.keys().cloned().collect::>()) - .unwrap_or_default() - } else { - cols.clone() - }; - html.push_str("
"); - for k in &headers { - html.push_str(&format!("", crate::page::html_escape(k))); - } - html.push_str(""); - if rows.is_empty() { - html.push_str(&format!( - "", - headers.len() + 1 - )); - } else { - for r in &rows { - html.push_str(""); - let obj = r.as_object().cloned().unwrap_or_default(); - for k in &headers { - let cell = obj.get(k).map(cell_display).unwrap_or_default(); - let truncated = if cell.chars().count() > 120 { - let s: String = cell.chars().take(117).collect(); - format!("{s}…") - } else { - cell - }; - html.push_str(&format!( - "", - crate::page::html_escape(&truncated) - )); - } - let id = obj.get("id").map(cell_display).unwrap_or_default(); - let id_e = crate::page::html_escape(&id); - html.push_str(&format!( - "" - )); - } - } - html.push_str("
{}Actions
No rows yet.
{}\ - Edit\ -
\ -
\ -
"); - Ok(admin_shell( - &format!("Admin · {table}"), - &html, - &tables, - Some(table), - )) -} - -fn form_fields(cols: &[String], values: Option<&Map>) -> String { - let mut fields = String::from("
"); - let mut any = false; - for c in cols { - if c == "id" { - continue; - } - any = true; - let name = crate::page::html_escape(c); - let val = values - .and_then(|m| m.get(c)) - .map(cell_display) - .unwrap_or_default(); - let val_e = crate::page::html_escape(&val); - if c == "body" || c == "content" || c == "正文" || c == "detail" { - fields.push_str(&format!( - "" - )); - } else { - fields.push_str(&format!( - "" - )); - } - } - if !any { - fields.push_str("

No editable columns.

"); - } - fields.push_str("
"); - fields -} - -pub fn admin_new_form_html(url: &str, table: &str) -> Result { - let tables = list_user_tables(url).unwrap_or_default(); - let cols = table_columns(url, table)?; - let fields = form_fields(&cols, None); - let t = crate::page::html_escape(table); - let actions = format!("Cancel"); - let mut html = admin_bar( - &format!("New · {table}"), - &format!("Admin / {t} / new"), - &actions, - ); - html.push_str(&format!( - "
{fields}\ -
\ - \ - Back\ -
" - )); - Ok(admin_shell( - &format!("New {table}"), - &html, - &tables, - Some(table), - )) -} - -pub fn admin_edit_form_html(url: &str, table: &str, id: &str) -> Result { - let tables = list_user_tables(url).unwrap_or_default(); - let cols = table_columns(url, table)?; - let row = get_row(url, table, id)?; - let obj = row.as_object(); - let fields = form_fields(&cols, obj); - let t = crate::page::html_escape(table); - let id_e = crate::page::html_escape(id); - let actions = format!("Cancel"); - let mut html = admin_bar( - &format!("Edit · {table} #{id}"), - &format!("Admin / {t} / {id_e}"), - &actions, - ); - html.push_str(&format!( - "
{fields}\ -
\ - \ - Back\ -
" - )); - Ok(admin_shell( - &format!("Edit {table}"), - &html, - &tables, - Some(table), - )) -} - -pub fn admin_log_html(url: &str) -> Result { - ensure_admin_log(url)?; - let tables = list_user_tables(url).unwrap_or_default(); - let data = query_sql( - url, - "SELECT id, at, action, table_name, row_id, detail FROM _marqdo_admin_log ORDER BY id DESC LIMIT 200", - None, - )?; - let rows = data - .get("rows") - .and_then(|v| v.as_array()) - .cloned() - .unwrap_or_default(); - let mut html = admin_bar("Activity log", "Admin / log", ""); - html.push_str( - "
\ - \ - ", - ); - if rows.is_empty() { - html.push_str(""); - } else { - for r in &rows { - let o = r.as_object().cloned().unwrap_or_default(); - html.push_str(""); - for k in ["id", "at", "action", "table_name", "row_id", "detail"] { - let mut cell = o.get(k).map(cell_display).unwrap_or_default(); - if k == "detail" && cell.chars().count() > 80 { - cell = format!("{}…", cell.chars().take(77).collect::()); - } - let class = if k == "action" { - format!( - " class=\"log-action log-{}\"", - crate::page::html_escape(&cell) - ) - } else { - String::new() - }; - html.push_str(&format!( - "{}", - crate::page::html_escape(&cell) - )); - } - html.push_str(""); - } - } - html.push_str("
idatactiontablerowdetail
No log entries yet.
"); - Ok(admin_shell("Admin log", &html, &tables, None)) + .map_err(|e| e.to_string())? + .collect::, _>>() + .map_err(|e| e.to_string())?; + Ok(rows) } diff --git a/plugins/web/src/http.rs b/plugins/web/src/http.rs index c87d43c..6ff62ad 100644 --- a/plugins/web/src/http.rs +++ b/plugins/web/src/http.rs @@ -1,402 +1,144 @@ -//! Async HTTP server (tokio + axum). +//! Blocking HTTP listen: page shell, `/_part/{id}`, optional `/admin`. -use std::collections::HashMap; use std::net::SocketAddr; -use std::path::PathBuf; use std::sync::Arc; -use std::time::Duration; -use axum::body::Body; -use axum::extract::{Path as AxPath, State}; -use axum::http::{header, StatusCode}; -use axum::response::{Html, IntoResponse, Response}; +use axum::extract::{Path, State}; +use axum::response::{Html, IntoResponse, Redirect, Response}; use axum::routing::get; -use axum::{Form, Router}; -use serde_json::{json, Value}; -use tower_http::services::ServeDir; +use axum::Router; +use serde_json::{json, Map, Value}; +use tokio::runtime::Runtime; use crate::db; -use crate::page; +use crate::render; #[derive(Clone)] struct AppState { - /// Pre-rendered static HTML (optional). - pages: HashMap, - /// Live page configs re-rendered per request (path → page JSON). - page_cfgs: HashMap, + page: Value, db_url: Option, - admin_tables: Vec, + admin: bool, } -fn arg_str(args: &Value, key: &str, default: &str) -> String { - args.get(key) - .and_then(|v| v.as_str()) - .unwrap_or(default) - .to_string() -} - -fn arg_u16(args: &Value, key: &str, default: u16) -> u16 { - match args.get(key) { - Some(Value::Number(n)) => n.as_u64().unwrap_or(default as u64) as u16, - Some(Value::String(s)) => s.parse().unwrap_or(default), - _ => default, - } -} - -fn normalize_path(p: &str) -> String { - if p.is_empty() || p == "/" { - return "/".into(); - } - let mut s = p.to_string(); - if !s.starts_with('/') { - s.insert(0, '/'); - } - if s.len() > 1 && s.ends_with('/') { - s.pop(); - } - s -} - -fn build_pages(args: &Value) -> (HashMap, HashMap) { - let mut pages = HashMap::new(); - let mut cfgs = HashMap::new(); - - if let Some(page_cfg) = args.get("page") { - cfgs.insert("/".into(), page_cfg.clone()); - } - - if let Some(routes) = args.get("routes").and_then(|v| v.as_array()) { - for r in routes { - let path = r - .get("path") - .or_else(|| r.get("href")) - .and_then(|v| v.as_str()) - .unwrap_or("/"); - let path = normalize_path(path); - if let Some(cfg) = r.get("page") { - cfgs.insert(path.clone(), cfg.clone()); - } else if let Some(h) = r.get("html").and_then(|v| v.as_str()) { - pages.insert(path, h.to_string()); - } else if r.get("nav").is_some() || r.get("main").is_some() || r.get("intro").is_some() - { - cfgs.insert(path, r.clone()); - } else { - pages.insert(path, page::render_page(r)); - } - } - } - - if pages.is_empty() && cfgs.is_empty() { - pages.insert("/".into(), page::default_hello_html()); - } - (pages, cfgs) -} - -fn resolve_admin_tables(args: &Value, db_url: Option<&str>) -> Vec { - let from_args: Vec = args - .get("admin_tables") - .and_then(|v| v.as_array()) - .map(|a| { - a.iter() - .filter_map(|v| v.as_str().map(|s| s.to_string())) - .collect() - }) - .unwrap_or_default(); - if !from_args.is_empty() { - return from_args; - } - let Some(url) = db_url else { - return Vec::new(); - }; - db::list_user_tables(url).unwrap_or_default() -} - -fn render_live(st: &AppState, cfg: &Value) -> String { - page::render_page_with_db(cfg, st.db_url.as_deref()) -} - -async fn serve_page( - State(st): State>, - axum::extract::OriginalUri(uri): axum::extract::OriginalUri, -) -> Response { - let path = normalize_path(uri.path()); - if let Some(cfg) = st.page_cfgs.get(&path) { - return Html(render_live(&st, cfg)).into_response(); - } - if let Some(html) = st.pages.get(&path) { - return Html(html.clone()).into_response(); - } - ( - StatusCode::NOT_FOUND, - Html(page::render_page(&json!({ - "title": "404", - "main": "

404

Not found

", - "nav": [{"label": "Home", "href": "/"}], - }))), - ) - .into_response() -} - -fn admin_tables_now(st: &AppState) -> Vec { - if !st.admin_tables.is_empty() { - return st.admin_tables.clone(); - } - let Some(url) = st.db_url.as_ref() else { - return Vec::new(); - }; - db::list_user_tables(url).unwrap_or_default() -} - -async fn admin_home(State(st): State>) -> Response { - let tables = admin_tables_now(&st); - Html(db::admin_home_html(st.db_url.as_deref(), &tables)).into_response() -} - -async fn admin_log_page(State(st): State>) -> Response { - let Some(url) = st.db_url.as_ref() else { - return Html("

No database

").into_response(); - }; - match db::admin_log_html(url) { - Ok(html) => Html(html).into_response(), - Err(e) => ( - StatusCode::INTERNAL_SERVER_ERROR, - Html(page::html_escape(&e)), - ) - .into_response(), - } -} - -async fn admin_table(State(st): State>, AxPath(table): AxPath) -> Response { - let Some(url) = st.db_url.as_ref() else { - return Html("

No database

").into_response(); - }; - let tables = admin_tables_now(&st); - if !tables.iter().any(|t| t == &table) { - return (StatusCode::NOT_FOUND, Html("

Unknown table

")).into_response(); - } - match db::admin_list_html(url, &table) { - Ok(html) => Html(html).into_response(), - Err(e) => ( - StatusCode::INTERNAL_SERVER_ERROR, - Html(page::html_escape(&e)), - ) - .into_response(), - } -} - -async fn admin_new_get(State(st): State>, AxPath(table): AxPath) -> Response { - let Some(url) = st.db_url.as_ref() else { - return Html("

No database

").into_response(); - }; - let tables = admin_tables_now(&st); - if !tables.iter().any(|t| t == &table) { - return (StatusCode::NOT_FOUND, "unknown").into_response(); - } - match db::admin_new_form_html(url, &table) { - Ok(html) => Html(html).into_response(), - Err(e) => (StatusCode::BAD_REQUEST, Html(page::html_escape(&e))).into_response(), - } -} - -async fn admin_new_post( - State(st): State>, - AxPath(table): AxPath, - Form(form): Form>, -) -> Response { - let Some(url) = st.db_url.as_ref() else { - return Html("

No database

").into_response(); - }; - let tables = admin_tables_now(&st); - if !tables.iter().any(|t| t == &table) { - return (StatusCode::NOT_FOUND, "unknown").into_response(); - } - let mut map = serde_json::Map::new(); - for (k, v) in form { - if k == "id" { - continue; - } - map.insert(k, Value::String(v)); - } - match db::insert_row(url, &table, &Value::Object(map)) { - Ok(_) => Response::builder() - .status(StatusCode::SEE_OTHER) - .header(header::LOCATION, format!("/admin/{table}")) - .body(Body::empty()) - .unwrap(), - Err(e) => (StatusCode::BAD_REQUEST, Html(page::html_escape(&e))).into_response(), - } -} - -async fn admin_edit_get( - State(st): State>, - AxPath((table, id)): AxPath<(String, String)>, -) -> Response { - let Some(url) = st.db_url.as_ref() else { - return Html("

No database

").into_response(); - }; - let tables = admin_tables_now(&st); - if !tables.iter().any(|t| t == &table) { - return (StatusCode::NOT_FOUND, "unknown").into_response(); - } - match db::admin_edit_form_html(url, &table, &id) { - Ok(html) => Html(html).into_response(), - Err(e) => (StatusCode::BAD_REQUEST, Html(page::html_escape(&e))).into_response(), - } -} - -async fn admin_edit_post( - State(st): State>, - AxPath((table, id)): AxPath<(String, String)>, - Form(form): Form>, -) -> Response { - let Some(url) = st.db_url.as_ref() else { - return Html("

No database

").into_response(); - }; - let tables = admin_tables_now(&st); - if !tables.iter().any(|t| t == &table) { - return (StatusCode::NOT_FOUND, "unknown").into_response(); - } - let mut map = serde_json::Map::new(); - for (k, v) in form { - if k == "id" { - continue; - } - map.insert(k, Value::String(v)); - } - match db::update_row(url, &table, &id, &Value::Object(map)) { - Ok(_) => Response::builder() - .status(StatusCode::SEE_OTHER) - .header(header::LOCATION, format!("/admin/{table}")) - .body(Body::empty()) - .unwrap(), - Err(e) => (StatusCode::BAD_REQUEST, Html(page::html_escape(&e))).into_response(), - } -} - -async fn admin_delete_post( - State(st): State>, - AxPath((table, id)): AxPath<(String, String)>, -) -> Response { - let Some(url) = st.db_url.as_ref() else { - return Html("

No database

").into_response(); - }; - let tables = admin_tables_now(&st); - if !tables.iter().any(|t| t == &table) { - return (StatusCode::NOT_FOUND, "unknown").into_response(); - } - match db::delete_row(url, &table, &id) { - Ok(_) => Response::builder() - .status(StatusCode::SEE_OTHER) - .header(header::LOCATION, format!("/admin/{table}")) - .body(Body::empty()) - .unwrap(), - Err(e) => (StatusCode::BAD_REQUEST, Html(page::html_escape(&e))).into_response(), - } -} - -/// Blocking entry used by ABI: run async server until Ctrl-C or optional duration_ms. -pub fn listen(args: &Value) -> Result { - let host = arg_str(args, "host", "127.0.0.1"); - let port = arg_u16(args, "port", 8080); - let (pages, page_cfgs) = build_pages(args); - let static_dir = args - .get("static_dir") - .and_then(|v| v.as_str()) - .map(PathBuf::from); - let db_url = args - .get("db_url") - .and_then(|v| v.as_str()) - .map(|s| s.to_string()); - let admin = args - .get("admin") - .and_then(|v| v.as_bool()) - .unwrap_or(false); - let admin_tables = resolve_admin_tables(args, db_url.as_deref()); - let duration_ms = match args.get("duration_ms") { - Some(Value::Number(n)) => n.as_u64(), - Some(Value::String(s)) => s.parse().ok(), - _ => None, - }; - +pub fn listen( + page: &Value, + db_url: Option<&str>, + host: &str, + port: u16, + admin: bool, +) -> Result { let state = Arc::new(AppState { - pages, - page_cfgs, - db_url: db_url.clone(), - admin_tables, + page: page.clone(), + db_url: db_url.map(|s| s.to_string()), + admin, }); - let mut app = Router::new().route("/", get(serve_page)); - let mut paths: Vec = state.pages.keys().cloned().collect(); - paths.extend(state.page_cfgs.keys().cloned()); - for path in paths { - if path == "/" { - continue; - } - if admin && (path == "/admin" || path.starts_with("/admin/")) { - continue; - } - app = app.route(&path, get(serve_page)); - } - app = app.fallback(get(serve_page)); + let app = Router::new() + .route("/", get(home)) + .route("/_part/{id}", get(part)) + .route("/admin", get(admin_home)) + .route("/admin/{table}", get(admin_table)) + .with_state(state); - if admin { - if let Some(url) = db_url.as_deref() { - let _ = db::ensure_admin_log(url); - } - app = app - .route("/admin", get(admin_home)) - .route("/admin/log", get(admin_log_page)) - .route("/admin/{table}", get(admin_table)) - .route( - "/admin/{table}/new", - get(admin_new_get).post(admin_new_post), - ) - .route( - "/admin/{table}/{id}/edit", - get(admin_edit_get).post(admin_edit_post), - ) - .route("/admin/{table}/{id}/delete", axum::routing::post(admin_delete_post)); - } - - if let Some(dir) = static_dir { - if dir.is_dir() { - app = app.nest_service("/static", ServeDir::new(dir)); - } - } - - let app = app.with_state(state); let addr: SocketAddr = format!("{host}:{port}") .parse() - .map_err(|e| format!("bad addr: {e}"))?; - - let rt = tokio::runtime::Builder::new_multi_thread() - .enable_all() - .build() - .map_err(|e| format!("tokio runtime: {e}"))?; + .map_err(|e| format!("bad listen addr {host}:{port}: {e}"))?; + let rt = Runtime::new().map_err(|e| e.to_string())?; rt.block_on(async move { let listener = tokio::net::TcpListener::bind(addr) .await .map_err(|e| format!("bind {addr}: {e}"))?; - let bound = listener - .local_addr() - .map_err(|e| format!("local_addr: {e}"))?; - eprintln!("marqdo web listening on http://{bound}"); + eprintln!("marqdo web listening on http://{addr}"); + axum::serve(listener, app) + .await + .map_err(|e| format!("serve: {e}")) + })?; + Ok(json!({ "ok": true })) +} - let server = axum::serve(listener, app); - if let Some(ms) = duration_ms { - tokio::select! { - r = server => r.map_err(|e| format!("server: {e}"))?, - _ = tokio::time::sleep(Duration::from_millis(ms)) => {} - } - } else { - server - .with_graceful_shutdown(async { - let _ = tokio::signal::ctrl_c().await; - }) - .await - .map_err(|e| format!("server: {e}"))?; +async fn home(State(st): State>) -> Html { + let html = render::render_page(&st.page, st.db_url.as_deref()); + Html(html) +} + +async fn part(State(st): State>, Path(id): Path) -> Response { + let Some(parts) = st.page.get("parts").and_then(|v| v.as_object()) else { + return Html(String::from("

no parts

")).into_response(); + }; + let Some(cfg) = parts.get(&id) else { + return Html(format!("

unknown part {id}

")).into_response(); + }; + let html = render::render_fragment(cfg, st.db_url.as_deref()); + Html(html).into_response() +} + +async fn admin_home(State(st): State>) -> Response { + if !st.admin { + return Html(String::from("

admin disabled

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

no database

")).into_response(); + }; + let tables = db::list_tables(url).unwrap_or_default(); + let mut body = String::from( + "admin", + ); + body.push_str("

admin

    "); + for t in &tables { + body.push_str(&format!("
  • {t}
  • ")); + } + body.push_str("

home

"); + Html(body).into_response() +} + +async fn admin_table(State(st): State>, Path(table): Path) -> Response { + if !st.admin { + return Redirect::to("/").into_response(); + } + let Some(url) = st.db_url.as_deref() else { + return Html(String::from("

no database

")).into_response(); + }; + let Ok(data) = db::select(url, &table, 200) else { + return Html(format!("

cannot read {table}

")).into_response(); + }; + let rows = data + .get("rows") + .and_then(|v| v.as_array()) + .cloned() + .unwrap_or_default(); + let mut body = format!( + "{table}" + ); + body.push_str(&format!("

{table}

back

")); + let cols: Vec = rows + .first() + .and_then(|r| r.as_object()) + .map(|m| m.keys().cloned().collect()) + .unwrap_or_default(); + for c in &cols { + body.push_str(&format!("")); + } + body.push_str(""); + for row in &rows { + 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(); + body.push_str(&format!("", esc(&cell))); } - Ok(json!({ "ok": true, "addr": bound.to_string() })) - }) + body.push_str(""); + } + body.push_str("
{c}
{}
"); + Html(body).into_response() +} + +fn esc(s: &str) -> String { + s.replace('&', "&") + .replace('<', "<") + .replace('>', ">") } diff --git a/plugins/web/src/lib.rs b/plugins/web/src/lib.rs index c91ab8a..efb5512 100644 --- a/plugins/web/src/lib.rs +++ b/plugins/web/src/lib.rs @@ -1,9 +1,10 @@ -//! Marqdo web plugin (C ABI v2): async HTTP, SQLite, page shell, admin. +//! Marqdo web plugin (C ABI v2): SQLite, page assemble, HTTP listen. +mod compose; mod db; mod http; -mod page; -mod table_util; +mod render; +mod table; use std::ffi::{CStr, CString}; use std::os::raw::{c_char, c_int, c_void}; @@ -45,6 +46,8 @@ pub struct MarqdoHostApi { static mut HOST_FREE: Option = None; static mut HOST_ALLOC: Option *mut c_void> = None; +static mut HOST_QUERY: Option = None; +static mut HOST_USERDATA: *mut c_void = ptr::null_mut(); unsafe fn host_strdup(s: &str) -> *mut c_char { let alloc = HOST_ALLOC.expect("host alloc"); @@ -86,198 +89,291 @@ fn parse_args(args_json: *const c_char) -> Result { if s.trim().is_empty() { return Ok(json!({})); } - serde_json::from_str(s).map_err(|e| format!("json: {e}")) + serde_json::from_str(s).map_err(|e| e.to_string()) } -fn arg_text<'a>(args: &'a Value, key: &str) -> Result<&'a str, String> { - args.get(key) - .and_then(|v| v.as_str()) +fn take_host_string(p: *mut c_char) -> Option { + if p.is_null() { + return None; + } + let s = unsafe { CStr::from_ptr(p) } + .to_str() + .ok() + .map(|s| s.to_string()); + unsafe { + if let Some(free) = HOST_FREE { + free(p as *mut c_void); + } + } + s +} + +fn host_query_json(name: &str, args: &Value) -> Result { + let query = unsafe { HOST_QUERY }.ok_or_else(|| "host_query not available".to_string())?; + let userdata = unsafe { HOST_USERDATA }; + let c_name = CString::new(name).map_err(|e| e.to_string())?; + let c_args = CString::new(args.to_string()).map_err(|e| e.to_string())?; + let mut out_ptr: *mut c_char = ptr::null_mut(); + let mut err_ptr: *mut c_char = ptr::null_mut(); + let rc = unsafe { + query( + userdata, + c_name.as_ptr(), + c_args.as_ptr(), + &mut out_ptr, + &mut err_ptr, + ) + }; + let err = take_host_string(err_ptr); + let out = take_host_string(out_ptr); + if rc != 0 { + return Err(err.unwrap_or_else(|| format!("host_query `{name}` failed"))); + } + let out = out.unwrap_or_else(|| "null".into()); + serde_json::from_str(&out).map_err(|e| format!("host_query `{name}` bad JSON: {e}")) +} + +fn call_lib(path: &str) -> Result { + host_query_json("call_lib_path", &json!({ "path": path })) +} + +fn arg_text(v: &Value, key: &str) -> Result { + match v.get(key) { + None | Some(Value::Null) => Err(format!("missing `{key}`")), + Some(Value::String(s)) => Ok(s.clone()), + Some(Value::Number(n)) => Ok(n.to_string()), + Some(Value::Bool(b)) => Ok(b.to_string()), + Some(other) => Ok(other.to_string()), + } +} + +fn arg_str<'a>(v: &'a Value, key: &str) -> Result<&'a str, String> { + v.get(key) + .and_then(|x| x.as_str()) .ok_or_else(|| format!("missing `{key}`")) } +fn arg_str_opt<'a>(v: &'a Value, key: &str) -> Option<&'a str> { + v.get(key).and_then(|x| x.as_str()).filter(|s| !s.is_empty()) +} + +fn db_url_of(args: &Value) -> Result { + if let Some(s) = arg_str_opt(args, "url").or_else(|| arg_str_opt(args, "db_url")) { + return Ok(s.to_string()); + } + if let Some(db) = args.get("db") { + if let Some(s) = db.get("url").and_then(|v| v.as_str()) { + return Ok(s.to_string()); + } + } + Err("missing db url".into()) +} + +fn reply(out_json: *mut *mut c_char, err_msg: *mut *mut c_char, r: Result) -> c_int { + match r { + Ok(v) => { + set_out(out_json, &v.to_string()); + 0 + } + Err(e) => { + set_err(err_msg, &e); + 1 + } + } +} + macro_rules! web_ffi { - ($name:ident, $body:expr, $label:expr) => { + ($name:ident, $body:expr) => { unsafe extern "C" fn $name( args_json: *const c_char, out_json: *mut *mut c_char, err_msg: *mut *mut c_char, ) -> c_int { - match (|| -> Result { - let args = parse_args(args_json)?; - $body(&args) - })() { - Ok(v) => { - set_out(out_json, &v.to_string()); - 0 - } + let args = match parse_args(args_json) { + Ok(v) => v, Err(e) => { - set_err(err_msg, &format!("{}: {e}", $label)); - 1 + set_err(err_msg, &format!("{}: {e}", stringify!($name))); + return 1; } - } + }; + let r: Result = (|| $body(&args))(); + reply( + out_json, + err_msg, + r.map_err(|e| format!("{}: {e}", stringify!($name))), + ) } }; } -web_ffi!( - web_render, - |args: &Value| Ok(Value::String(page::render_page(args))), - "web_render" -); +web_ffi!(web_page_new, |args: &Value| { + let title = arg_str_opt(args, "title").unwrap_or("Marqdo Web"); + let intro = arg_str_opt(args, "intro").unwrap_or(""); + Ok(json!({ + "title": title, + "intro": intro, + })) +}); -web_ffi!( - web_as_links, - |args: &Value| { - let table = args.get("table").cloned().unwrap_or(Value::Null); - Ok(table_util::as_links(&table)) - }, - "web_as_links" -); +web_ffi!(web_compose_components, |args: &Value| { + let page = args.get("page").cloned().unwrap_or(json!({})); + let components = args + .get("components") + .cloned() + .ok_or_else(|| "missing `components`".to_string())?; + compose::compose_components(&page, &components, |path| call_lib(path)) +}); -web_ffi!( - web_as_fields, - |args: &Value| { - let table = args.get("table").cloned().unwrap_or(Value::Null); - Ok(table_util::as_fields(&table)) - }, - "web_as_fields" -); +web_ffi!(web_compose_main, |args: &Value| { + let page = args.get("page").cloned().unwrap_or(json!({})); + let main = args + .get("main") + .cloned() + .ok_or_else(|| "missing `main`".to_string())?; + compose::compose_main(&page, &main, |path| call_lib(path)) +}); -web_ffi!( - web_as_bind, - |args: &Value| { - let table = args.get("table").cloned().unwrap_or(Value::Null); - Ok(table_util::as_bind(&table)) - }, - "web_as_bind" -); +web_ffi!(web_render, |args: &Value| { + let page = args.get("page").cloned().unwrap_or_else(|| args.clone()); + let db_url = db_url_of(args).ok(); + let html = render::render_page(&page, db_url.as_deref()); + Ok(Value::String(html)) +}); -web_ffi!( - web_as_rows, - |args: &Value| { - let table = args.get("table").cloned().unwrap_or(Value::Null); - Ok(table_util::as_rows(&table)) - }, - "web_as_rows" -); +web_ffi!(web_db_new, |args: &Value| { + let url = arg_str_opt(args, "url").unwrap_or("sqlite:site.db"); + Ok(json!({ "url": url })) +}); -web_ffi!( - web_listen, - |args: &Value| http::listen(args), - "web_listen" -); +web_ffi!(web_db_init, |args: &Value| { + let url = db_url_of(args)?; + let name = arg_str(args, "name") + .or_else(|_| arg_str(args, "table"))? + .to_string(); + let fields = args.get("fields").cloned().unwrap_or(json!([])); + db::init(&url, &name, &fields) +}); -web_ffi!( - web_db_migrate, - |args: &Value| { - let url = args - .get("url") - .or_else(|| args.get("db_url")) +web_ffi!(web_db_insert, |args: &Value| { + let url = db_url_of(args)?; + let table = arg_str(args, "table")?.to_string(); + let rows = args + .get("rows") + .or_else(|| args.get("row")) + .cloned() + .unwrap_or(json!([])); + db::insert(&url, &table, &rows) +}); + +web_ffi!(web_db_select, |args: &Value| { + let url = db_url_of(args)?; + let table = arg_str(args, "table")?.to_string(); + let limit = args + .get("limit") + .and_then(|v| v.as_i64()) + .unwrap_or(200); + db::select(&url, &table, limit) +}); + +web_ffi!(web_db_get, |args: &Value| { + let url = db_url_of(args)?; + let table = arg_str(args, "table")?.to_string(); + let id = arg_text(args, "id")?; + db::get(&url, &table, &id) +}); + +web_ffi!(web_db_update, |args: &Value| { + let url = db_url_of(args)?; + let table = arg_str(args, "table")?.to_string(); + let id = arg_text(args, "id")?; + let row = args.get("row").cloned().unwrap_or(json!({})); + db::update(&url, &table, &id, &row) +}); + +web_ffi!(web_db_delete, |args: &Value| { + let url = db_url_of(args)?; + let table = arg_str(args, "table")?.to_string(); + let id = arg_text(args, "id")?; + db::delete(&url, &table, &id) +}); + +web_ffi!(web_db_exec, |args: &Value| { + let url = db_url_of(args)?; + let sql = arg_str(args, "sql")?.to_string(); + let args_v = args.get("args"); + db::exec(&url, &sql, args_v) +}); + +web_ffi!(web_db_list_tables, |args: &Value| { + let url = db_url_of(args)?; + let tables = db::list_tables(&url)?; + Ok(json!({ "tables": tables })) +}); + +web_ffi!(web_app_new, |args: &Value| { + let page = args.get("page").cloned().unwrap_or(json!({})); + let db = args.get("db").cloned().unwrap_or(Value::Null); + let host = arg_str_opt(args, "host").unwrap_or("127.0.0.1"); + let port = args + .get("port") + .and_then(|v| v.as_u64().or_else(|| v.as_i64().map(|i| i as u64))) + .unwrap_or(18081); + let admin = match args.get("admin") { + Some(Value::Bool(b)) => *b, + Some(Value::String(s)) => matches!(s.as_str(), "true" | "True" | "1" | "yes"), + Some(Value::Number(n)) => n.as_i64().unwrap_or(0) != 0, + _ => false, + }; + Ok(json!({ + "page": page, + "db": db, + "host": host, + "port": port, + "admin": admin, + })) +}); + +web_ffi!(web_listen, |args: &Value| { + let (page, db_url, host, port, admin) = 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(); + let host = arg_str_opt(args, "host").unwrap_or("127.0.0.1"); + let port = args + .get("port") + .and_then(|v| v.as_u64().or_else(|| v.as_i64().map(|i| i as u64))) + .unwrap_or(18081) as u16; + let admin = match args.get("admin") { + Some(Value::Bool(b)) => *b, + _ => false, + }; + (page, db_url, host.to_string(), port, admin) + } else { + let app = args.get("app").cloned().unwrap_or_else(|| args.clone()); + let page = app.get("page").cloned().unwrap_or(json!({})); + let db_url = app + .get("db") + .and_then(|d| d.get("url")) .and_then(|v| v.as_str()) - .ok_or_else(|| "missing `url`".to_string())?; - let dir = args - .get("dir") + .map(|s| s.to_string()) + .or_else(|| arg_str_opt(&app, "db_url").map(|s| s.to_string())); + let host = app + .get("host") .and_then(|v| v.as_str()) - .unwrap_or("migrations"); - db::migrate(url, dir) - }, - "web_db_migrate" -); - -web_ffi!( - web_db_define, - |args: &Value| { - let url = args - .get("url") - .or_else(|| args.get("db_url")) - .and_then(|v| v.as_str()) - .ok_or_else(|| "missing `url`".to_string())?; - let table = arg_text(args, "table")?; - let fields = args.get("fields").cloned().unwrap_or(json!([])); - let primary = args - .get("primary") - .and_then(|v| v.as_str()) - .unwrap_or("id"); - db::define_table(url, table, &fields, primary) - }, - "web_db_define" -); - -web_ffi!( - web_db_all, - |args: &Value| { - let url = args - .get("url") - .or_else(|| args.get("db_url")) - .and_then(|v| v.as_str()) - .ok_or_else(|| "missing `url`".to_string())?; - let table = arg_text(args, "table")?; - let limit = args - .get("limit") - .and_then(|v| v.as_i64()) - .unwrap_or(200); - db::query_all(url, table, limit) - }, - "web_db_all" -); - -web_ffi!( - web_db_exec, - |args: &Value| { - let url = args - .get("url") - .or_else(|| args.get("db_url")) - .and_then(|v| v.as_str()) - .ok_or_else(|| "missing `url`".to_string())?; - let sql = arg_text(args, "sql")?; - db::exec_sql(url, sql, args.get("args")) - }, - "web_db_exec" -); - -web_ffi!( - web_db_query, - |args: &Value| { - let url = args - .get("url") - .or_else(|| args.get("db_url")) - .and_then(|v| v.as_str()) - .ok_or_else(|| "missing `url`".to_string())?; - let sql = arg_text(args, "sql")?; - db::query_sql(url, sql, args.get("args")) - }, - "web_db_query" -); - -web_ffi!( - web_db_insert, - |args: &Value| { - let url = args - .get("url") - .or_else(|| args.get("db_url")) - .and_then(|v| v.as_str()) - .ok_or_else(|| "missing `url`".to_string())?; - let table = arg_text(args, "table")?; - if let Some(rows) = args.get("rows") { - let normalized = table_util::as_rows(rows); - return db::insert_rows(url, table, &normalized); - } - let row = args.get("row").cloned().unwrap_or(json!({})); - let normalized = table_util::as_rows(&row); - if let Some(arr) = normalized.as_array() { - if arr.len() > 1 || row.as_object().is_some_and(|m| { - m.values().any(|v| v.is_array()) - }) { - return db::insert_rows(url, table, &normalized); - } - if let Some(one) = arr.first() { - return db::insert_row(url, table, one); - } - } - db::insert_row(url, table, &row) - }, - "web_db_insert" -); + .unwrap_or("127.0.0.1") + .to_string(); + let port = app + .get("port") + .and_then(|v| v.as_u64().or_else(|| v.as_i64().map(|i| i as u64))) + .unwrap_or(18081) as u16; + let admin = app + .get("admin") + .and_then(|v| v.as_bool()) + .unwrap_or(false); + (page, db_url, host, port, admin) + }; + http::listen(&page, db_url.as_deref(), &host, port, admin) +}); fn register(host: &MarqdoHostApi, name: &str, params: &str, fn_ptr: PluginFn) -> c_int { let register = match host.register_fn { @@ -294,6 +390,9 @@ pub unsafe extern "C" fn marqdo_plugin_abi_version() -> u32 { ABI_VERSION } +#[no_mangle] +pub unsafe extern "C" fn marqdo_plugin_shutdown() {} + #[no_mangle] pub unsafe extern "C" fn marqdo_plugin_init(host: *const MarqdoHostApi) -> c_int { if host.is_null() { @@ -302,83 +401,41 @@ pub unsafe extern "C" fn marqdo_plugin_init(host: *const MarqdoHostApi) -> c_int let host = &*host; HOST_ALLOC = host.alloc; HOST_FREE = host.free; + HOST_QUERY = host.host_query; + HOST_USERDATA = host.userdata; if host.host_query.is_none() { return 1; } - if register(host, "web_render", "title,nav,sidebar,footer,main", web_render) != 0 { - return 1; - } - if register(host, "web_as_links", "table", web_as_links) != 0 { - return 1; - } - if register(host, "web_as_fields", "table", web_as_fields) != 0 { - return 1; - } - if register(host, "web_as_bind", "table", web_as_bind) != 0 { - return 1; - } - if register(host, "web_as_rows", "table", web_as_rows) != 0 { - return 1; - } - if register(host, "web_listen", "host,port", web_listen) != 0 { - return 1; - } - if register(host, "web_db_migrate", "url,dir", web_db_migrate) != 0 { - return 1; - } - if register(host, "web_db_define", "url,table,fields", web_db_define) != 0 { - return 1; - } - if register(host, "web_db_all", "url,table", web_db_all) != 0 { - return 1; - } - if register(host, "web_db_exec", "url,sql", web_db_exec) != 0 { - return 1; - } - if register(host, "web_db_query", "url,sql", web_db_query) != 0 { - return 1; - } - if register(host, "web_db_insert", "url,table,rows", web_db_insert) != 0 { - return 1; + + let regs = [ + ("web_page_new", "title,intro", web_page_new as PluginFn), + ( + "web_compose_components", + "page,components", + web_compose_components as PluginFn, + ), + ("web_compose_main", "page,main", web_compose_main as PluginFn), + ("web_render", "page", web_render as PluginFn), + ("web_db_new", "url", web_db_new as PluginFn), + ("web_db_init", "url,name,fields", web_db_init as PluginFn), + ("web_db_insert", "url,table,rows", web_db_insert as PluginFn), + ("web_db_select", "url,table,limit", web_db_select as PluginFn), + ("web_db_get", "url,table,id", web_db_get as PluginFn), + ("web_db_update", "url,table,id,row", web_db_update as PluginFn), + ("web_db_delete", "url,table,id", web_db_delete as PluginFn), + ("web_db_exec", "url,sql,args", web_db_exec as PluginFn), + ("web_db_list_tables", "url", web_db_list_tables as PluginFn), + ( + "web_app_new", + "page,db,admin,host,port", + web_app_new as PluginFn, + ), + ("web_listen", "app", web_listen as PluginFn), + ]; + for (name, params, f) in regs { + if register(host, name, params, f) != 0 { + return 1; + } } 0 } - -#[no_mangle] -pub unsafe extern "C" fn marqdo_plugin_shutdown() { - HOST_ALLOC = None; - HOST_FREE = None; -} - -#[cfg(test)] -mod tests { - use super::*; - - #[test] - fn render_contains_nav() { - let html = page::render_page(&json!({ - "title": "T", - "nav": [{"label": "Home", "href": "/"}], - "main": "

hi

", - })); - assert!(html.contains("Home")); - assert!(html.contains("

hi

")); - } - - #[test] - fn define_and_query_sqlite() { - let dir = std::env::temp_dir().join(format!("mq-web-{}", std::process::id())); - let _ = std::fs::remove_dir_all(&dir); - std::fs::create_dir_all(&dir).unwrap(); - let url = format!("sqlite:{}/t.db", dir.display()); - let fields = json!([ - {"name": "id", "type": "integer", "null": false}, - {"name": "title", "type": "text", "null": false}, - ]); - db::define_table(&url, "posts", &fields, "id").unwrap(); - db::insert_row(&url, "posts", &json!({"title": "hello"})).unwrap(); - let rows = db::query_all(&url, "posts", 10).unwrap(); - assert_eq!(rows["count"], 1); - let _ = std::fs::remove_dir_all(&dir); - } -} diff --git a/plugins/web/src/page.rs b/plugins/web/src/page.rs deleted file mode 100644 index 12eb061..0000000 --- a/plugins/web/src/page.rs +++ /dev/null @@ -1,546 +0,0 @@ -//! HTML page shell + content layouts (prose / cards / table / list). -//! Regions resolve from unified bind tables (`front` / `back` / `css`). - -use serde_json::{json, Map, Value}; - -use crate::db; -use crate::table_util::{ - as_bind, bind_has_db, bind_table_name, binds_as_static_links, project_rows, qualify_binds, -}; - -const DEFAULT_THEME_CSS: &str = include_str!("theme.css"); - -fn link_label(item: &Value) -> String { - item.get("label") - .or_else(|| item.get("标签")) - .and_then(|v| v.as_str()) - .unwrap_or("") - .to_string() -} - -fn link_href(item: &Value) -> String { - item.get("href") - .or_else(|| item.get("链接")) - .or_else(|| item.get("路径")) - .and_then(|v| v.as_str()) - .unwrap_or("#") - .to_string() -} - -fn link_css(item: &Value) -> String { - item.get("css") - .or_else(|| item.get("class")) - .and_then(|v| v.as_str()) - .unwrap_or("") - .to_string() -} - -fn class_attr(css: &str) -> String { - let css = css.trim(); - if css.is_empty() { - String::new() - } else { - format!(" class=\"{}\"", html_escape(css)) - } -} - -fn render_links(items: &[Value], class: &str) -> String { - let mut out = format!("
    "); - for it in items { - let label = html_escape(&link_label(it)); - let href = html_escape(&link_href(it)); - let css = class_attr(&link_css(it)); - out.push_str(&format!("
  • {label}
  • ")); - } - out.push_str("
"); - out -} - -pub fn html_escape(s: &str) -> String { - let mut out = String::with_capacity(s.len()); - for c in s.chars() { - match c { - '&' => out.push_str("&"), - '<' => out.push_str("<"), - '>' => out.push_str(">"), - '"' => out.push_str("""), - '\'' => out.push_str("'"), - _ => out.push(c), - } - } - out -} - -fn items_from(v: Option<&Value>) -> Vec { - match v { - Some(Value::Array(a)) => a.clone(), - Some(Value::Object(m)) => { - if let Some(Value::Array(rows)) = m.get("rows") { - return rows.clone(); - } - Vec::new() - } - _ => Vec::new(), - } -} - -fn looks_like_bind(v: &Value) -> bool { - match v { - Value::Array(a) => a.first().and_then(|x| x.as_object()).is_some_and(|m| { - m.contains_key("front") - || m.contains_key("前端变量") - || m.contains_key("页面导航") - || m.contains_key("label") - }), - Value::Object(m) => { - m.contains_key("前端变量") - || m.contains_key("front") - || m.contains_key("页面导航") - || m.contains_key("对应路由") - } - _ => false, - } -} - -fn cell_text(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 record_title(obj: &Map) -> String { - for k in ["title", "标题", "name", "名", "label", "标签"] { - if let Some(v) = obj.get(k) { - let s = cell_text(v); - if !s.is_empty() { - return s; - } - } - } - obj.iter() - .find(|(k, _)| *k != "_css" && *k != "id") - .map(|(_, v)| cell_text(v)) - .unwrap_or_else(|| "item".into()) -} - -fn record_body(obj: &Map) -> String { - for k in ["body", "正文", "content", "内容", "description", "描述", "summary"] { - if let Some(v) = obj.get(k) { - let s = cell_text(v); - if !s.is_empty() { - return s; - } - } - } - String::new() -} - -fn field_css(obj: &Map, field: &str) -> String { - obj.get("_css") - .and_then(|v| v.as_object()) - .and_then(|m| m.get(field)) - .and_then(|v| v.as_str()) - .unwrap_or("") - .to_string() -} - -fn render_cards(items: &[Value]) -> String { - let mut out = String::from("
"); - for it in items { - if let Some(obj) = it.as_object() { - let title = html_escape(&record_title(obj)); - let body = record_body(obj); - let title_css = class_attr(&field_css(obj, "title")); - let title_css = if title_css.is_empty() { - class_attr(&field_css(obj, "标题")) - } else { - title_css - }; - let body_css = class_attr(&field_css(obj, "body")); - let body_css = if body_css.is_empty() { - class_attr(&field_css(obj, "正文")) - } else { - body_css - }; - out.push_str("
"); - out.push_str(&format!("{title}")); - if !body.is_empty() { - out.push_str(&format!("{}

", html_escape(&body))); - } - // Extra bound fronts (not title/body/id/_css) - for (k, v) in obj { - if matches!( - k.as_str(), - "title" - | "标题" - | "body" - | "正文" - | "content" - | "内容" - | "id" - | "_css" - | "name" - | "名" - | "label" - | "标签" - ) { - continue; - } - let css = class_attr(&field_css(obj, k)); - out.push_str(&format!( - "
{}
", - html_escape(k), - html_escape(&cell_text(v)) - )); - } - if let Some(id) = obj.get("id") { - out.push_str(&format!( - "
#{}
", - html_escape(&cell_text(id)) - )); - } - out.push_str("
"); - } else if let Some(s) = it.as_str() { - out.push_str(&format!( - "

{}

", - html_escape(s) - )); - } - } - out.push_str("
"); - out -} - -fn render_table(items: &[Value]) -> String { - let Some(first) = items.first().and_then(|v| v.as_object()) else { - return String::from("

No rows.

"); - }; - let cols: Vec = first - .keys() - .filter(|k| *k != "_css") - .cloned() - .collect(); - let mut out = String::from("
"); - for c in &cols { - out.push_str(&format!("", html_escape(c))); - } - out.push_str(""); - for it in items { - let Some(obj) = it.as_object() else { - continue; - }; - out.push_str(""); - for c in &cols { - let cell = obj.get(c).map(cell_text).unwrap_or_default(); - let css = class_attr(&field_css(obj, c)); - out.push_str(&format!("{}", html_escape(&cell))); - } - out.push_str(""); - } - out.push_str("
{}
"); - out -} - -fn render_list(items: &[Value]) -> String { - let mut out = String::from("
    "); - for it in items { - if let Some(obj) = it.as_object() { - let title = html_escape(&record_title(obj)); - let body = record_body(obj); - let title_css = class_attr(&field_css(obj, "title")); - if body.is_empty() { - out.push_str(&format!("{title}")); - } else { - out.push_str(&format!( - "
  • {title} — {}
  • ", - html_escape(&body) - )); - } - } else if let Some(s) = it.as_str() { - out.push_str(&format!("
  • {}
  • ", html_escape(s))); - } - } - out.push_str("
"); - out -} - -fn render_main_block(intro: &str, items: Option<&Vec>, layout: &str) -> String { - let mut out = String::new(); - if !intro.is_empty() { - out.push_str(&format!("
{intro}
")); - } - let Some(items) = items.filter(|v| !v.is_empty()) else { - return out; - }; - match layout { - "table" | "表格" => out.push_str(&render_table(items)), - "list" | "列表" => out.push_str(&render_list(items)), - "prose" | "正文" => { - out.push_str("
"); - for it in items { - if let Some(obj) = it.as_object() { - let title = html_escape(&record_title(obj)); - let body = record_body(obj); - let title_css = class_attr(&field_css(obj, "title")); - let body_css = class_attr(&field_css(obj, "body")); - out.push_str(&format!("{title}")); - if !body.is_empty() { - out.push_str(&format!("{}

", html_escape(&body))); - } - } - } - out.push_str("
"); - } - _ => out.push_str(&render_cards(items)), - } - out -} - -/// Resolve a region value into link items (static or DB-looped). -fn resolve_link_region( - raw: Option<&Value>, - db_url: Option<&str>, - default_table: Option<&str>, -) -> Vec { - let Some(raw) = raw else { - return Vec::new(); - }; - // Already resolved link list? - if let Value::Array(a) = raw { - if a.first().and_then(|x| x.as_object()).is_some_and(|m| { - m.contains_key("label") || m.contains_key("href") - }) && !a - .first() - .and_then(|x| x.as_object()) - .is_some_and(|m| m.contains_key("front")) - { - return a.clone(); - } - } - if !looks_like_bind(raw) { - return items_from(Some(raw)); - } - let binds = as_bind(raw); - let arr = qualify_binds(binds.as_array().map(|v| v.as_slice()).unwrap_or(&[]), default_table); - if bind_has_db(&arr) { - let Some(url) = db_url else { - return Vec::new(); - }; - let Some(table) = bind_table_name(&arr) else { - return Vec::new(); - }; - let Ok(data) = db::query_all(url, &table, 200) else { - return Vec::new(); - }; - let rows = data - .get("rows") - .and_then(|v| v.as_array()) - .cloned() - .unwrap_or_default(); - let projected = project_rows(&arr, &rows); - let mut links = Vec::new(); - for it in projected.as_array().cloned().unwrap_or_default() { - let obj = it.as_object().cloned().unwrap_or_default(); - let label = obj - .get("label") - .or_else(|| obj.get("标签")) - .or_else(|| obj.get("title")) - .or_else(|| obj.get("前端变量")) - .map(cell_text) - .filter(|s| !s.is_empty()) - .or_else(|| { - obj.iter() - .find(|(k, _)| *k != "_css" && *k != "id" && *k != "href" && *k != "路径") - .map(|(_, v)| cell_text(v)) - }) - .unwrap_or_default(); - let href = obj - .get("href") - .or_else(|| obj.get("路径")) - .or_else(|| obj.get("对应路由")) - .map(cell_text) - .filter(|s| !s.is_empty()) - .unwrap_or_else(|| "#".into()); - let css = obj - .get("_css") - .and_then(|v| v.as_object()) - .and_then(|m| { - m.get("label") - .or_else(|| m.get("title")) - .or_else(|| m.values().next()) - }) - .and_then(|v| v.as_str()) - .unwrap_or("") - .to_string(); - links.push(json!({ "label": label, "href": href, "css": css })); - } - links - } else { - binds_as_static_links(&arr) - .as_array() - .cloned() - .unwrap_or_default() - } -} - -/// Resolve main: bind table → DB loop, or legacy live list / HTML intro. -fn resolve_main( - args: &Value, - db_url: Option<&str>, - default_table: Option<&str>, -) -> (String, Option>) { - let intro = args - .get("intro") - .and_then(|v| v.as_str()) - .unwrap_or("") - .to_string(); - - if let Some(items) = args.get("main_items").and_then(|v| v.as_array()) { - return (intro, Some(items.clone())); - } - - let main = args.get("main"); - if let Some(raw) = main { - if looks_like_bind(raw) { - let binds = as_bind(raw); - let arr = qualify_binds(binds.as_array().map(|v| v.as_slice()).unwrap_or(&[]), default_table); - if bind_has_db(&arr) { - if let (Some(url), Some(table)) = (db_url, bind_table_name(&arr)) { - if let Ok(data) = db::query_all(url, &table, 200) { - let rows = data - .get("rows") - .and_then(|v| v.as_array()) - .cloned() - .unwrap_or_default(); - let projected = project_rows(&arr, &rows); - return ( - intro, - Some(projected.as_array().cloned().unwrap_or_default()), - ); - } - } - return (intro, Some(Vec::new())); - } - } - if let Value::Array(a) = raw { - return (intro, Some(a.clone())); - } - if let Some(s) = raw.as_str() { - if intro.is_empty() { - return (s.to_string(), None); - } - } - } - - if !intro.is_empty() { - return (intro, None); - } - if let Some(s) = main.and_then(|v| v.as_str()) { - return (s.to_string(), None); - } - ("

Welcome

".into(), None) -} - -/// Render a four-region page shell; optional `db_url` resolves live binds. -pub fn render_page(args: &Value) -> String { - let db_url = args - .get("db_url") - .or_else(|| args.get("url")) - .and_then(|v| v.as_str()); - render_page_with_db(args, db_url) -} - -pub fn render_page_with_db(args: &Value, db_url: Option<&str>) -> String { - let title = args - .get("title") - .and_then(|v| v.as_str()) - .unwrap_or("Marqdo Web"); - let theme_css = args.get("css").and_then(|v| v.as_str()).unwrap_or(""); - let layout = args - .get("layout") - .or_else(|| args.get("主体样式")) - .and_then(|v| v.as_str()) - .unwrap_or("cards"); - let default_table = args - .get("table") - .or_else(|| args.get("数据表")) - .and_then(|v| v.as_str()); - - let nav = resolve_link_region(args.get("nav"), db_url, default_table); - let sidebar = resolve_link_region(args.get("sidebar"), db_url, default_table); - let footer = resolve_link_region(args.get("footer"), db_url, default_table); - let (intro, main_items) = resolve_main(args, db_url, default_table); - - let body_main = if main_items.is_some() { - render_main_block(&intro, main_items.as_ref(), layout) - } else if !intro.is_empty() { - format!("
{intro}
") - } else { - String::from("

Welcome

") - }; - - let has_side = !sidebar.is_empty(); - let layout_class = if has_side { - "has-sidebar" - } else { - "no-sidebar" - }; - let extra_css = if theme_css.is_empty() { - String::new() - } else { - format!( - "", - html_escape(theme_css) - ) - }; - let side = if has_side { - format!( - "", - render_links(&sidebar, "side-nav") - ) - } else { - String::new() - }; - - format!( - r#" - - - - -{title} - -{extra_css} - - -
{nav}
-{side} -
{main}
-
{foot}
- -"#, - title = html_escape(title), - builtin = DEFAULT_THEME_CSS, - extra_css = extra_css, - layout_class = layout_class, - nav = render_links(&nav, "nav"), - side = side, - main = body_main, - foot = render_links(&footer, "foot-nav"), - ) -} - -pub fn default_hello_html() -> String { - render_page(&json!({ - "title": "Marqdo Web", - "nav": [{"label": "Home", "href": "/"}], - "intro": "

Marqdo Web

Hello from ext/web.

", - "footer": [{"label": "Marqdo", "href": "https://github.com/cflmy/marqdo"}], - })) -} diff --git a/plugins/web/src/render.rs b/plugins/web/src/render.rs new file mode 100644 index 0000000..642f148 --- /dev/null +++ b/plugins/web/src/render.rs @@ -0,0 +1,344 @@ +//! Minimal HTML shell for assembled pages / parts. + +use serde_json::{Map, Value}; + +use crate::db; +use crate::table::{as_bind, normalize_slot, project_rows}; + +fn esc(s: &str) -> String { + s.replace('&', "&") + .replace('<', "<") + .replace('>', ">") + .replace('"', """) +} + +fn text(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 class_attr(css: &str) -> String { + if css.is_empty() { + String::new() + } else { + format!(" class=\"{}\"", esc(css)) + } +} + +fn resolve_links(raw: Option<&Value>, db_url: Option<&str>) -> Vec<(String, String)> { + let Some(raw) = raw else { + return Vec::new(); + }; + let binds = as_bind(raw); + let arr = binds.as_array().cloned().unwrap_or_default(); + 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('.')) + }); + if has_db { + let Some(url) = db_url else { + return Vec::new(); + }; + let table = crate::table::bind_table_name(&arr); + let Some(table) = table else { + return Vec::new(); + }; + let Ok(data) = db::select(url, &table, 200) else { + return Vec::new(); + }; + let rows = data + .get("rows") + .and_then(|v| v.as_array()) + .cloned() + .unwrap_or_default(); + let projected = project_rows(&arr, &rows); + let mut out = Vec::new(); + for it in projected.as_array().cloned().unwrap_or_default() { + let m = it.as_object().cloned().unwrap_or_default(); + let label = m + .get("title") + .or_else(|| m.get("label")) + .map(text) + .unwrap_or_default(); + let href = m + .get("href") + .or_else(|| m.get("path")) + .map(text) + .unwrap_or_else(|| "#".into()); + if !label.is_empty() { + out.push((label, href)); + } + } + return out; + } + // static: front=label back=href + arr.into_iter() + .map(|b| { + let label = b.get("front").map(text).unwrap_or_default(); + let href = b.get("back").map(text).unwrap_or_else(|| "#".into()); + (label, href) + }) + .filter(|(l, _)| !l.is_empty()) + .collect() +} + +fn render_ul(links: &[(String, String)], class: &str) -> String { + let mut s = format!("
    ", esc(class)); + for (label, href) in links { + s.push_str(&format!( + "
  • {}
  • ", + esc(href), + esc(label) + )); + } + s.push_str("
"); + s +} + +fn resolve_main(args: &Value, db_url: Option<&str>) -> (String, Vec>) { + let intro = args + .get("intro") + .and_then(|v| v.as_str()) + .unwrap_or("") + .to_string(); + let Some(main) = args.get("main") else { + return (intro, Vec::new()); + }; + let binds = as_bind(main); + let arr = binds.as_array().cloned().unwrap_or_default(); + if arr.is_empty() { + return (intro, Vec::new()); + } + let Some(url) = db_url else { + return (intro, Vec::new()); + }; + let Some(table) = crate::table::bind_table_name(&arr) else { + return (intro, Vec::new()); + }; + let Ok(data) = db::select(url, &table, 200) else { + return (intro, Vec::new()); + }; + let rows = data + .get("rows") + .and_then(|v| v.as_array()) + .cloned() + .unwrap_or_default(); + let projected = project_rows(&arr, &rows); + let items = projected + .as_array() + .cloned() + .unwrap_or_default() + .into_iter() + .filter_map(|v| v.as_object().cloned()) + .collect(); + (intro, items) +} + +fn field_css(obj: &Map, field: &str) -> String { + obj.get("_css") + .and_then(|v| v.as_object()) + .and_then(|m| m.get(field)) + .and_then(|v| v.as_str()) + .unwrap_or("") + .to_string() +} + +fn slot_attrs(slot: &str, parts: &Map) -> String { + let mut a = format!(" data-slot=\"{}\"", esc(slot)); + for (id, cfg) in parts { + let s = cfg + .get("slot") + .or_else(|| cfg.get("fragment")) + .and_then(|v| v.as_str()) + .unwrap_or(""); + if s == slot || (slot == "sidebar" && id == "side") || (slot == "main" && id == "index") { + a.push_str(&format!(" data-slot-src=\"/_part/{}\"", esc(id))); + break; + } + } + a +} + +fn slot_class(args: &Value, slot: &str, base: &str) -> String { + let extra = args + .get("slot_class") + .and_then(|v| v.as_object()) + .and_then(|m| m.get(slot)) + .and_then(|v| v.as_str()) + .unwrap_or(""); + if extra.is_empty() { + base.to_string() + } else { + format!("{base} {extra}") + } +} + +const SHELL_CSS: &str = r#" +:root { --ink:#1c1917; --muted:#57534e; --paper:#fafaf9; --line:#e7e5e4; --accent:#0f766e; } +body { margin:0; font-family: "IBM Plex Sans", "Noto Sans SC", sans-serif; background:var(--paper); color:var(--ink); display:grid; min-height:100vh; grid-template-rows:auto 1fr auto; } +body.has-sidebar { grid-template-columns:14rem 1fr; grid-template-areas:"top top" "side main" "foot foot"; } +body.no-sidebar { grid-template-areas:"top" "main" "foot"; } +header.topnav { grid-area:top; border-bottom:1px solid var(--line); padding:.85rem 1.25rem; background:#fff; } +aside.side { grid-area:side; border-right:1px solid var(--line); padding:1.25rem 1rem; background:#f5f5f4; } +main.main { grid-area:main; padding:1.5rem 1.25rem 2rem; } +footer.foot { grid-area:foot; border-top:1px solid var(--line); padding:.85rem 1.25rem; color:var(--muted); background:#fff; } +ul.nav, ul.side-nav, ul.foot-nav { list-style:none; margin:0; padding:0; display:flex; flex-wrap:wrap; gap:.35rem 1rem; } +ul.side-nav { flex-direction:column; } +a { color:var(--ink); text-decoration:none; } +a:hover { color:var(--accent); } +.content.cards { display:grid; gap:1rem; margin-top:1.25rem; grid-template-columns:repeat(auto-fill,minmax(16rem,1fr)); } +.content.cards article { background:#fff; border:1px solid var(--line); border-radius:6px; padding:1rem; } +.main-intro h1 { margin:0 0 .75rem; font-size:2rem; } +.main-intro p { color:var(--muted); } +"#; + +pub fn render_page(args: &Value, db_url: Option<&str>) -> String { + let title = args + .get("title") + .and_then(|v| v.as_str()) + .unwrap_or("Marqdo Web"); + let extra = args + .get("styles_css") + .and_then(|v| v.as_str()) + .unwrap_or(""); + let parts = args + .get("parts") + .and_then(|v| v.as_object()) + .cloned() + .unwrap_or_default(); + + let nav = resolve_links(args.get("nav"), db_url); + let side = resolve_links(args.get("sidebar"), db_url); + let foot = resolve_links(args.get("footer"), db_url); + let (intro, items) = resolve_main(args, db_url); + + let has_side = args.get("sidebar").is_some() || !side.is_empty(); + let body_class = if has_side { + "has-sidebar" + } else { + "no-sidebar" + }; + + let mut main_html = String::new(); + if !intro.is_empty() { + main_html.push_str(&format!("
{intro}
")); + } + if !items.is_empty() { + main_html.push_str("
"); + for it in &items { + let title = it + .get("title") + .map(text) + .unwrap_or_else(|| "item".into()); + let body = it.get("body").map(text).unwrap_or_default(); + let tc = class_attr(&field_css(it, "title")); + let bc = class_attr(&field_css(it, "body")); + main_html.push_str("
"); + main_html.push_str(&format!("{}", esc(&title))); + if !body.is_empty() { + main_html.push_str(&format!("{}

", esc(&body))); + } + main_html.push_str("
"); + } + main_html.push_str("
"); + } + + format!( + r#" + + + +{title} + + + +
{nav_ul}
+{side_html} +
{main_html}
+
{foot_ul}
+"#, + title = esc(title), + nav_class = slot_class(args, "nav", "topnav"), + nav_attrs = slot_attrs("nav", &parts), + nav_ul = render_ul(&nav, "nav"), + side_html = if has_side { + format!( + "", + slot_class(args, "sidebar", "side"), + slot_attrs("sidebar", &parts), + render_ul(&side, "side-nav") + ) + } else { + String::new() + }, + main_class = slot_class(args, "main", "main"), + main_attrs = slot_attrs("main", &parts), + foot_class = slot_class(args, "footer", "foot"), + foot_attrs = slot_attrs("footer", &parts), + foot_ul = render_ul(&foot, "foot-nav"), + ) +} + +pub fn render_fragment(args: &Value, db_url: Option<&str>) -> String { + let slot = args + .get("fragment") + .or_else(|| args.get("slot")) + .and_then(|v| v.as_str()) + .map(normalize_slot) + .unwrap_or_else(|| "main".into()); + match slot.as_str() { + "nav" => { + let links = resolve_links(args.get("nav"), db_url); + format!( + "
{}
", + render_ul(&links, "nav") + ) + } + "sidebar" => { + let links = resolve_links(args.get("sidebar"), db_url); + format!( + "", + render_ul(&links, "side-nav") + ) + } + "footer" => { + let links = resolve_links(args.get("footer"), db_url); + format!( + "
{}
", + render_ul(&links, "foot-nav") + ) + } + _ => { + let (intro, items) = resolve_main(args, db_url); + let mut body = String::new(); + if !intro.is_empty() { + body.push_str(&format!("
{intro}
")); + } + if !items.is_empty() { + body.push_str("
"); + for it in &items { + let title = it.get("title").map(text).unwrap_or_default(); + let b = it.get("body").map(text).unwrap_or_default(); + let tc = class_attr(&field_css(it, "title")); + let bc = class_attr(&field_css(it, "body")); + body.push_str(&format!( + "
{}{}

", + esc(&title), + esc(&b) + )); + } + body.push_str("
"); + } + format!("
{body}
") + } + } +} diff --git a/plugins/web/src/table.rs b/plugins/web/src/table.rs new file mode 100644 index 0000000..18a3ed5 --- /dev/null +++ b/plugins/web/src/table.rs @@ -0,0 +1,395 @@ +//! GFM table helpers + site path parsing (cells stay string literals). + +use serde_json::{json, Map, Value}; + +const FIELD_KEYS: &[&str] = &["字段", "name", "列", "column"]; +const TYPE_KEYS: &[&str] = &["类型", "type"]; +const NULL_KEYS: &[&str] = &["可空", "null", "nullable"]; +const FRONT_KEYS: &[&str] = &["属性", "前端变量", "front", "field"]; +const BACK_KEYS: &[&str] = &["值", "后端数据库", "back", "db"]; +const CSS_KEYS: &[&str] = &["样式", "绑定css样式", "css", "class", "style"]; +const SRC_KEYS: &[&str] = &["组件", "导入的页面", "src", "page"]; +const STYLE_KEYS: &[&str] = &["样式", "style", "class"]; +const PROP_KEYS: &[&str] = &["属性", "property", "prop", "名", "name"]; +const VAL_KEYS: &[&str] = &["值", "value"]; + +pub fn normalize_ref(s: &str) -> String { + let s = s.trim(); + let mut out = String::with_capacity(s.len()); + let mut rest = s; + while let Some(start) = rest.find('`') { + out.push_str(&rest[..start]); + rest = &rest[start + 1..]; + if let Some(end) = rest.find('`') { + out.push_str(&rest[..end]); + rest = &rest[end + 1..]; + } else { + out.push('`'); + out.push_str(rest); + return out; + } + } + out.push_str(rest); + out +} + +fn pick<'a>(m: &'a Map, keys: &[&str]) -> Option<&'a Value> { + keys.iter().find_map(|k| m.get(*k)) +} + +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 boolish(v: &Value) -> bool { + match v { + Value::Bool(b) => *b, + Value::String(s) => matches!(s.trim(), "1" | "true" | "True" | "yes" | "是" | "可"), + Value::Number(n) => n.as_i64().unwrap_or(0) != 0, + _ => false, + } +} + +/// Schema table → `[{name,type,nullable}, …]` +pub fn as_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 = pick(m, FIELD_KEYS).map(cell_str).unwrap_or_default(); + if name.is_empty() { + continue; + } + let ty = pick(m, TYPE_KEYS) + .map(cell_str) + .unwrap_or_else(|| "text".into()); + let nullable = pick(m, NULL_KEYS).map(boolish).unwrap_or(true); + out.push(json!({ "name": name, "type": ty, "nullable": nullable })); + } + } + Value::Array(out) + } + Value::Object(m) => { + let names = pick(m, FIELD_KEYS).map(as_str_list).unwrap_or_default(); + let types = pick(m, TYPE_KEYS).map(as_str_list).unwrap_or_default(); + let nulls = pick(m, NULL_KEYS).map(as_str_list).unwrap_or_default(); + let mut out = Vec::new(); + for (i, name) in names.iter().enumerate() { + if name.is_empty() { + continue; + } + let ty = types.get(i).cloned().unwrap_or_else(|| "text".into()); + let nullable = nulls + .get(i) + .map(|s| boolish(&Value::String(s.clone()))) + .unwrap_or(true); + out.push(json!({ "name": name, "type": ty, "nullable": nullable })); + } + Value::Array(out) + } + _ => json!([]), + } +} + +/// Seed / row table → list of maps. +pub fn as_rows(table: &Value) -> Value { + match table { + Value::Array(a) => Value::Array(a.clone()), + Value::Object(m) => { + // @ / 行 / row column → list of maps + let keys: Vec = m.keys().cloned().collect(); + let row_key = ["@", "行", "row"] + .iter() + .find(|k| m.contains_key(**k)) + .map(|s| s.to_string()); + if let Some(rk) = row_key { + let n = as_str_list(m.get(&rk).unwrap()).len(); + let mut out = Vec::new(); + for i in 0..n { + let mut row = Map::new(); + for k in &keys { + if k == &rk { + continue; + } + let list = as_str_list(m.get(k).unwrap_or(&Value::Null)); + row.insert(k.clone(), json!(list.get(i).cloned().unwrap_or_default())); + } + if let Some(id) = as_str_list(m.get(&rk).unwrap()).get(i) { + if !id.is_empty() { + row.insert("id".into(), json!(id)); + } + } + out.push(Value::Object(row)); + } + return Value::Array(out); + } + // Columnar GFM table: each value is a same-length array → zip into rows. + let mut col_lens: Vec = Vec::new(); + let mut all_arrays = !m.is_empty(); + for v in m.values() { + match v { + Value::Array(a) => col_lens.push(a.len()), + _ => { + all_arrays = false; + break; + } + } + } + if all_arrays { + let n = col_lens.iter().copied().max().unwrap_or(0); + if n > 0 && col_lens.iter().all(|&l| l == n || l == 0) { + let mut out = Vec::new(); + for i in 0..n { + let mut row = Map::new(); + for (k, v) in m { + if let Value::Array(a) = v { + row.insert( + k.clone(), + a.get(i).cloned().unwrap_or(Value::Null), + ); + } + } + out.push(Value::Object(row)); + } + return Value::Array(out); + } + } + // single map + Value::Array(vec![Value::Object(m.clone())]) + } + _ => json!([]), + } +} + +/// Bind table → `[{front,back,css}, …]` +pub fn as_bind(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 front = normalize_ref(&pick(m, FRONT_KEYS).map(cell_str).unwrap_or_default()); + let back = normalize_ref(&pick(m, BACK_KEYS).map(cell_str).unwrap_or_default()); + let css = normalize_ref(&pick(m, CSS_KEYS).map(cell_str).unwrap_or_default()); + if !front.is_empty() || !back.is_empty() { + out.push(json!({ "front": front, "back": back, "css": css })); + } + } + } + Value::Array(out) + } + Value::Object(m) => { + let fronts = pick(m, FRONT_KEYS).map(as_str_list).unwrap_or_default(); + let backs = pick(m, BACK_KEYS).map(as_str_list).unwrap_or_default(); + let csses = pick(m, CSS_KEYS).map(as_str_list).unwrap_or_default(); + let n = fronts.len().max(backs.len()); + let mut out = Vec::new(); + for i in 0..n { + let front = normalize_ref(&fronts.get(i).cloned().unwrap_or_default()); + let back = normalize_ref(&backs.get(i).cloned().unwrap_or_default()); + let css = normalize_ref(&csses.get(i).cloned().unwrap_or_default()); + if !front.is_empty() || !back.is_empty() { + out.push(json!({ "front": front, "back": back, "css": css })); + } + } + Value::Array(out) + } + _ => json!([]), + } +} + +/// Page table → `[{src,style,slot}, …]` +pub fn as_compose(table: &Value) -> Value { + match table { + Value::Object(m) => { + let srcs = pick(m, SRC_KEYS).map(as_str_list).unwrap_or_default(); + let styles = pick(m, STYLE_KEYS).map(as_str_list).unwrap_or_default(); + let mut out = Vec::new(); + for (i, src_raw) in srcs.iter().enumerate() { + let src = normalize_ref(src_raw); + if src.is_empty() { + continue; + } + let style = normalize_ref(&styles.get(i).cloned().unwrap_or_default()); + let slot = infer_slot(&src); + out.push(json!({ "src": src, "style": style, "slot": slot })); + } + Value::Array(out) + } + Value::Array(rows) => { + let mut out = Vec::new(); + for row in rows { + if let Some(m) = row.as_object() { + let src = normalize_ref(&pick(m, SRC_KEYS).map(cell_str).unwrap_or_default()); + if src.is_empty() { + continue; + } + let style = normalize_ref(&pick(m, STYLE_KEYS).map(cell_str).unwrap_or_default()); + let slot = infer_slot(&src); + out.push(json!({ "src": src, "style": style, "slot": slot })); + } + } + Value::Array(out) + } + _ => json!([]), + } +} + +fn infer_slot(src: &str) -> String { + let base = src.rsplit('.').next().unwrap_or(src); + match base { + "nav" | "links" => "nav".into(), + "side" | "sidebar" => "sidebar".into(), + "foot" | "footer" => "footer".into(), + other => other.to_string(), + } +} + +pub fn normalize_slot(name: &str) -> String { + match name { + "nav" | "links" => "nav".into(), + "side" | "sidebar" => "sidebar".into(), + "foot" | "footer" => "footer".into(), + "main" | "index" | "" => "main".into(), + other => other.to_string(), + } +} + +/// Style table → CSS text for `.name { … }` +pub fn as_css_named(name: &str, table: &Value) -> String { + let name = normalize_ref(name); + if name.is_empty() { + return String::new(); + } + let mut rules = Vec::new(); + match table { + Value::Object(m) => { + let props = pick(m, PROP_KEYS).map(as_str_list).unwrap_or_default(); + let vals = pick(m, VAL_KEYS).map(as_str_list).unwrap_or_default(); + for (i, p) in props.iter().enumerate() { + if p.is_empty() { + continue; + } + let v = vals.get(i).cloned().unwrap_or_default(); + rules.push(format!(" {p}: {v};")); + } + } + Value::Array(rows) => { + for row in rows { + if let Some(m) = row.as_object() { + let p = pick(m, PROP_KEYS).map(cell_str).unwrap_or_default(); + let v = pick(m, VAL_KEYS).map(cell_str).unwrap_or_default(); + if !p.is_empty() { + rules.push(format!(" {p}: {v};")); + } + } + } + } + _ => {} + } + if rules.is_empty() { + return String::new(); + } + format!(".{} {{\n{}\n}}\n", name, rules.join("\n")) +} + +#[derive(Debug, Clone, PartialEq, Eq)] +pub enum SitePath { + LibMember { lib: String, member: String }, + DbField { table: String, field: String }, + Plain(String), +} + +pub fn parse_site_path(raw: &str) -> SitePath { + let s = normalize_ref(raw); + if s.is_empty() { + return SitePath::Plain(String::new()); + } + let parts: Vec<&str> = s.split('.').filter(|p| !p.is_empty()).collect(); + match parts.as_slice() { + [lib, member] => SitePath::LibMember { + lib: (*lib).into(), + member: (*member).into(), + }, + [_, table, field] => SitePath::DbField { + table: (*table).into(), + field: (*field).into(), + }, + _ => SitePath::Plain(s), + } +} + +pub fn bind_table_name(binds: &[Value]) -> Option { + let mut found: Option = None; + for b in binds { + let back = b.get("back").and_then(|v| v.as_str()).unwrap_or(""); + if let SitePath::DbField { table, .. } = parse_site_path(back) { + match &found { + None => found = Some(table), + Some(prev) if prev != &table => return None, + _ => {} + } + } else if back.contains('.') { + let mut p = back.splitn(2, '.'); + if let (Some(t), Some(_)) = (p.next(), p.next()) { + match &found { + None => found = Some(t.into()), + Some(prev) if prev != t => return None, + _ => {} + } + } + } + } + found +} + +pub fn project_rows(binds: &[Value], rows: &[Value]) -> Value { + let mut out = Vec::new(); + for row in rows { + let obj = row.as_object().cloned().unwrap_or_default(); + let mut m = Map::new(); + let mut css = Map::new(); + for b in binds { + let front = b.get("front").and_then(|v| v.as_str()).unwrap_or(""); + let back = b.get("back").and_then(|v| v.as_str()).unwrap_or(""); + let class = b.get("css").and_then(|v| v.as_str()).unwrap_or(""); + let col = match parse_site_path(back) { + SitePath::DbField { field, .. } => field, + SitePath::Plain(s) if s.contains('.') => { + s.split('.').next_back().unwrap_or(&s).to_string() + } + SitePath::Plain(s) => s, + SitePath::LibMember { .. } => back.to_string(), + }; + if let Some(v) = obj.get(&col).or_else(|| obj.get(front)) { + m.insert(front.to_string(), v.clone()); + } + if !class.is_empty() { + css.insert(front.to_string(), json!(class)); + } + } + if let Some(id) = obj.get("id") { + m.insert("id".into(), id.clone()); + } + if !css.is_empty() { + m.insert("_css".into(), Value::Object(css)); + } + out.push(Value::Object(m)); + } + Value::Array(out) +} diff --git a/plugins/web/src/table_util.rs b/plugins/web/src/table_util.rs deleted file mode 100644 index e066c53..0000000 --- a/plugins/web/src/table_util.rs +++ /dev/null @@ -1,627 +0,0 @@ -//! Convert Marqdo GFM table values (list-of-maps or column-oriented map) into -//! nav links / schema fields — so authors write readable tables, not JSON. - -use serde_json::{json, Map, Value}; - -const LABEL_KEYS: &[&str] = &[ - "页面导航", - "导航", - "label", - "标签", - "title", - "标题", - "名", - "name", -]; -const HREF_KEYS: &[&str] = &[ - "对应路由", - "路由", - "href", - "链接", - "路径", - "path", - "url", -]; -const FIELD_KEYS: &[&str] = &["字段", "name", "列", "名", "column"]; -const TYPE_KEYS: &[&str] = &["类型", "type"]; -const NULL_KEYS: &[&str] = &["可空", "null", "nullable"]; -const DEFAULT_KEYS: &[&str] = &["默认", "default"]; -const UNIQUE_KEYS: &[&str] = &["唯一", "unique"]; - -/// Unified UI bind: frontend var ↔ optional DB path / href ↔ optional CSS. -const FRONT_KEYS: &[&str] = &["前端变量", "front", "变量", "名", "field"]; -const BACK_KEYS: &[&str] = &[ - "后端数据库", - "back", - "数据库", - "字段绑定", - "db", - "绑定", -]; -const CSS_KEYS: &[&str] = &["绑定css样式", "css", "样式", "class", "style", "classes"]; - -fn pick<'a>(m: &'a Map, keys: &[&str]) -> Option<&'a Value> { - for k in keys { - if let Some(v) = m.get(*k) { - return Some(v); - } - } - None -} - -fn as_str_list(v: &Value) -> Vec { - match v { - Value::Array(a) => a - .iter() - .map(|x| match x { - Value::String(s) => s.clone(), - Value::Bool(b) => b.to_string(), - Value::Number(n) => n.to_string(), - Value::Null => String::new(), - other => other.to_string(), - }) - .collect(), - Value::String(s) => vec![s.clone()], - Value::Null => Vec::new(), - other => vec![other.to_string()], - } -} - -fn cell_str(v: &Value) -> String { - match v { - Value::String(s) => s.clone(), - Value::Bool(b) => b.to_string(), - Value::Number(n) => n.to_string(), - Value::Null => String::new(), - other => other.to_string(), - } -} - -fn boolish(v: &Value) -> bool { - match v { - Value::Bool(b) => *b, - Value::String(s) => matches!( - s.trim(), - "1" | "true" | "True" | "yes" | "是" | "可" | "nullable" - ), - Value::Number(n) => n.as_i64().unwrap_or(0) != 0, - _ => false, - } -} - -fn ident_ok(s: &str) -> bool { - !s.is_empty() - && s.chars() - .all(|c| c.is_ascii_alphanumeric() || c == '_') -} - -/// `table.column` DB reference (not a URL path). -pub fn is_db_ref(s: &str) -> bool { - let s = s.trim(); - if s.is_empty() || s.starts_with('/') || s.contains("://") { - return false; - } - let mut parts = s.split('.'); - match (parts.next(), parts.next(), parts.next()) { - (Some(t), Some(c), None) => ident_ok(t) && ident_ok(c), - _ => false, - } -} - -pub fn parse_db_ref(s: &str) -> Option<(String, String)> { - if !is_db_ref(s) { - return None; - } - let mut parts = s.trim().splitn(2, '.'); - Some((parts.next()?.to_string(), parts.next()?.to_string())) -} - -fn bind_row(front: String, back: String, css: String) -> Value { - json!({ "front": front, "back": back, "css": css }) -} - -fn looks_like_bind_map(m: &Map) -> bool { - pick(m, FRONT_KEYS).is_some() -} - -/// Turn the unified 3-col bind table into `[{front, back, css}, ...]`. -/// Also accepts legacy nav tables (`页面导航` / `对应路由`) as static link binds. -pub fn as_bind(table: &Value) -> Value { - match table { - Value::Null => json!([]), - Value::Array(rows) => { - let mut out = Vec::new(); - for row in rows { - if let Some(m) = row.as_object() { - if looks_like_bind_map(m) { - let front = pick(m, FRONT_KEYS).map(cell_str).unwrap_or_default(); - let back = pick(m, BACK_KEYS).map(cell_str).unwrap_or_default(); - let css = pick(m, CSS_KEYS).map(cell_str).unwrap_or_default(); - if !front.is_empty() || !back.is_empty() { - out.push(bind_row(front, back, css)); - } - } else if pick(m, LABEL_KEYS).is_some() || pick(m, HREF_KEYS).is_some() { - let front = pick(m, LABEL_KEYS).map(cell_str).unwrap_or_default(); - let back = pick(m, HREF_KEYS) - .map(cell_str) - .unwrap_or_else(|| "#".into()); - out.push(bind_row(front, back, String::new())); - } - } - } - Value::Array(out) - } - Value::Object(m) => { - if m.get("_type").and_then(|v| v.as_str()) == Some("live") { - return json!([]); - } - if looks_like_bind_map(m) { - let fronts = pick(m, FRONT_KEYS) - .map(as_str_list) - .unwrap_or_default(); - let backs = pick(m, BACK_KEYS).map(as_str_list).unwrap_or_default(); - let csses = pick(m, CSS_KEYS).map(as_str_list).unwrap_or_default(); - let n = fronts.len().max(backs.len()).max(csses.len()); - let mut out = Vec::with_capacity(n); - for i in 0..n { - let front = fronts.get(i).cloned().unwrap_or_default(); - let back = backs.get(i).cloned().unwrap_or_default(); - let css = csses.get(i).cloned().unwrap_or_default(); - if front.is_empty() && back.is_empty() { - continue; - } - out.push(bind_row(front, back, css)); - } - return Value::Array(out); - } - // Legacy column nav → bind rows (require label column; bare `url` is not nav) - let labels = pick(m, LABEL_KEYS) - .map(as_str_list) - .unwrap_or_default(); - let hrefs = pick(m, HREF_KEYS) - .map(as_str_list) - .unwrap_or_default(); - if !labels.is_empty() { - let n = labels.len().max(hrefs.len()); - let mut out = Vec::with_capacity(n); - for i in 0..n { - let front = labels.get(i).cloned().unwrap_or_default(); - let back = hrefs.get(i).cloned().unwrap_or_else(|| "#".into()); - out.push(bind_row(front, back, String::new())); - } - return Value::Array(out); - } - json!([]) - } - _ => json!([]), - } -} - -/// True when any bind row points at `table.column`. -pub fn bind_has_db(binds: &[Value]) -> bool { - binds.iter().any(|b| { - b.get("back") - .and_then(|v| v.as_str()) - .map(is_db_ref) - .unwrap_or(false) - }) -} - -/// Infer the single DB table name from bind rows (`posts.title` → `posts`). -pub fn bind_table_name(binds: &[Value]) -> Option { - let mut found: Option = None; - for b in binds { - let back = b.get("back").and_then(|v| v.as_str()).unwrap_or(""); - if let Some((t, _)) = parse_db_ref(back) { - match &found { - None => found = Some(t), - Some(prev) if prev != &t => return None, // mixed tables - _ => {} - } - } - } - found -} - -/// Static link region: each bind row is one link (`front`=label, `back`=href). -pub fn binds_as_static_links(binds: &[Value]) -> Value { - let mut out = Vec::new(); - for b in binds { - let label = b - .get("front") - .and_then(|v| v.as_str()) - .unwrap_or("") - .to_string(); - let href = b - .get("back") - .and_then(|v| v.as_str()) - .map(|s| { - let s = s.trim(); - if s.is_empty() { - "#" - } else { - s - } - }) - .unwrap_or("#") - .to_string(); - let css = b - .get("css") - .and_then(|v| v.as_str()) - .unwrap_or("") - .to_string(); - if label.is_empty() && href == "#" { - continue; - } - out.push(json!({ "label": label, "href": href, "css": css })); - } - Value::Array(out) -} - -/// Loop DB rows through field binds → `[{front: value, ..., _css: {front: class}}]`. -pub fn project_rows(binds: &[Value], rows: &[Value]) -> Value { - let mut out = Vec::with_capacity(rows.len()); - for row in rows { - let Some(obj) = row.as_object() else { - continue; - }; - let mut item = Map::new(); - let mut css_map = Map::new(); - for b in binds { - let front = b - .get("front") - .and_then(|v| v.as_str()) - .unwrap_or("") - .to_string(); - if front.is_empty() { - continue; - } - let back = b.get("back").and_then(|v| v.as_str()).unwrap_or(""); - let css = b.get("css").and_then(|v| v.as_str()).unwrap_or(""); - let val = if let Some((_, col)) = parse_db_ref(back) { - obj.get(&col).cloned().unwrap_or(Value::Null) - } else if back.is_empty() { - Value::String(front.clone()) - } else if ident_ok(back) { - obj.get(back).cloned().unwrap_or(Value::Null) - } else { - Value::String(back.to_string()) - }; - item.insert(front.clone(), val); - if !css.is_empty() { - css_map.insert(front, json!(css)); - } - } - // Keep id for meta when present on source row - if let Some(id) = obj.get("id") { - item.entry("id".to_string()).or_insert_with(|| id.clone()); - } - if !css_map.is_empty() { - item.insert("_css".into(), Value::Object(css_map)); - } - out.push(Value::Object(item)); - } - Value::Array(out) -} - -fn looks_like_href(s: &str) -> bool { - let s = s.trim(); - s.starts_with('/') - || s.starts_with('#') - || s.starts_with("http://") - || s.starts_with("https://") -} - -/// When `page.table=` is set, bare column backs become `table.column`. -/// There is **no** default table name — callers must pass one. -pub fn qualify_binds(binds: &[Value], table: Option<&str>) -> Vec { - let Some(t) = table.map(str::trim).filter(|s| !s.is_empty()) else { - return binds.to_vec(); - }; - if !ident_ok(t) { - return binds.to_vec(); - } - binds - .iter() - .map(|b| { - let front = b.get("front").cloned().unwrap_or(json!("")); - let css = b.get("css").cloned().unwrap_or(json!("")); - let back = b - .get("back") - .and_then(|v| v.as_str()) - .unwrap_or("") - .trim() - .to_string(); - let back = if back.is_empty() || is_db_ref(&back) || looks_like_href(&back) { - back - } else if ident_ok(&back) { - format!("{t}.{back}") - } else { - back - }; - json!({ "front": front, "back": back, "css": css }) - }) - .collect() -} - -const ROW_INDEX_KEYS: &[&str] = &["@", "行", "row"]; - -/// GFM data table → `[{col: val}, …]` for inserts. -/// Accepts: list-of-maps (`@`/`行` geometry), column-oriented map (dict of lists), or one map row. -pub fn as_rows(table: &Value) -> Value { - match table { - Value::Null => json!([]), - Value::Array(rows) => { - let mut out = Vec::new(); - for row in rows { - if let Some(m) = row.as_object() { - let mut clean = Map::new(); - for (k, v) in m { - if ROW_INDEX_KEYS.contains(&k.as_str()) { - continue; - } - clean.insert(k.clone(), v.clone()); - } - if !clean.is_empty() { - out.push(Value::Object(clean)); - } - } - } - Value::Array(out) - } - Value::Object(m) => { - let keys: Vec = m - .keys() - .filter(|k| !ROW_INDEX_KEYS.contains(&k.as_str())) - .cloned() - .collect(); - if keys.is_empty() { - return json!([]); - } - let any_list = keys.iter().any(|k| m.get(k).is_some_and(|v| v.is_array())); - if any_list { - let cols: Vec<(String, Vec)> = keys - .iter() - .map(|k| (k.clone(), as_str_list(m.get(k).unwrap_or(&Value::Null)))) - .collect(); - let n = cols.iter().map(|(_, v)| v.len()).max().unwrap_or(0); - let mut out = Vec::with_capacity(n); - for i in 0..n { - let mut row = Map::new(); - for (k, vals) in &cols { - row.insert( - k.clone(), - json!(vals.get(i).cloned().unwrap_or_default()), - ); - } - out.push(Value::Object(row)); - } - Value::Array(out) - } else { - let mut row = Map::new(); - for k in keys { - if let Some(v) = m.get(&k) { - row.insert(k, v.clone()); - } - } - json!([Value::Object(row)]) - } - } - _ => json!([]), - } -} - -/// Turn a nav/side/footer table into `[{label, href}, ...]`. -pub fn as_links(table: &Value) -> Value { - let binds = as_bind(table); - let arr = binds.as_array().cloned().unwrap_or_default(); - if bind_has_db(&arr) { - // Without DB handle here, return empty — callers should use project_rows. - return json!([]); - } - binds_as_static_links(&arr) -} - -/// Turn a schema table into `[{name, type, null, ...}, ...]`. -pub fn as_fields(table: &Value) -> Value { - match table { - Value::Null => json!([]), - Value::Array(rows) => { - let mut out = Vec::new(); - for row in rows { - if let Some(m) = row.as_object() { - if let Some(f) = field_from_map(m) { - out.push(f); - } - } - } - Value::Array(out) - } - Value::Object(m) => { - let names = pick(m, FIELD_KEYS) - .map(as_str_list) - .unwrap_or_default(); - let types = pick(m, TYPE_KEYS) - .map(as_str_list) - .unwrap_or_default(); - let nulls = pick(m, NULL_KEYS).map(as_str_list).unwrap_or_default(); - let defaults = pick(m, DEFAULT_KEYS) - .map(as_str_list) - .unwrap_or_default(); - let uniques = pick(m, UNIQUE_KEYS) - .map(as_str_list) - .unwrap_or_default(); - if names.is_empty() { - return json!([]); - } - let n = names.len(); - let mut out = Vec::with_capacity(n); - for i in 0..n { - let name = &names[i]; - if name.is_empty() || name == "@" || name == "行" || name == "row" { - continue; - } - let ty = types.get(i).cloned().unwrap_or_else(|| "text".into()); - let nullable = nulls - .get(i) - .map(|s| { - matches!( - s.trim(), - "1" | "true" | "True" | "yes" | "是" | "可" | "nullable" - ) - }) - .unwrap_or(true); - let mut field = json!({ - "name": name, - "type": ty, - "null": nullable, - }); - if let Some(d) = defaults.get(i) { - if !d.is_empty() { - field - .as_object_mut() - .unwrap() - .insert("default".into(), json!(d)); - } - } - if let Some(u) = uniques.get(i) { - let uniq = matches!(u.trim(), "1" | "true" | "True" | "yes" | "是" | "唯一"); - field - .as_object_mut() - .unwrap() - .insert("unique".into(), json!(uniq)); - } - out.push(field); - } - Value::Array(out) - } - _ => json!([]), - } -} - -fn field_from_map(m: &Map) -> Option { - let name = pick(m, FIELD_KEYS).map(cell_str)?; - if name.is_empty() || name == "@" || name == "行" || name == "row" { - return None; - } - let ty = pick(m, TYPE_KEYS) - .map(cell_str) - .unwrap_or_else(|| "text".into()); - let nullable = pick(m, NULL_KEYS).map(boolish).unwrap_or(true); - let mut field = json!({ - "name": name, - "type": ty, - "null": nullable, - }); - if let Some(d) = pick(m, DEFAULT_KEYS) { - field - .as_object_mut() - .unwrap() - .insert("default".into(), d.clone()); - } - if let Some(u) = pick(m, UNIQUE_KEYS) { - field - .as_object_mut() - .unwrap() - .insert("unique".into(), json!(boolish(u))); - } - Some(field) -} - -#[cfg(test)] -mod tests { - use super::*; - - #[test] - fn column_nav_table() { - let t = json!({ - "页面导航": ["首页", "管理"], - "对应路由": ["/", "/admin"], - }); - let links = as_links(&t); - assert_eq!(links.as_array().unwrap().len(), 2); - assert_eq!(links[0]["label"], "首页"); - assert_eq!(links[0]["href"], "/"); - assert_eq!(links[1]["label"], "管理"); - } - - #[test] - fn column_schema_table() { - let t = json!({ - "字段": ["id", "title"], - "类型": ["integer", "text"], - "可空": ["false", "false"], - }); - let fields = as_fields(&t); - assert_eq!(fields[0]["name"], "id"); - assert_eq!(fields[0]["type"], "integer"); - assert_eq!(fields[0]["null"], false); - } - - #[test] - fn column_bind_table() { - let t = json!({ - "前端变量": ["title", "body"], - "后端数据库": ["posts.title", "posts.body"], - "绑定css样式": ["card-title", "card-body"], - }); - let binds = as_bind(&t); - assert_eq!(binds.as_array().unwrap().len(), 2); - assert_eq!(binds[0]["front"], "title"); - assert_eq!(binds[0]["back"], "posts.title"); - assert_eq!(binds[0]["css"], "card-title"); - assert_eq!(bind_table_name(binds.as_array().unwrap()).as_deref(), Some("posts")); - } - - #[test] - fn static_nav_via_bind() { - let t = json!({ - "前端变量": ["首页", "管理"], - "后端数据库": ["/", "/admin"], - "绑定css样式": ["", ""], - }); - let links = as_links(&t); - assert_eq!(links[0]["label"], "首页"); - assert_eq!(links[0]["href"], "/"); - } - - #[test] - fn project_rows_applies_css() { - let binds = as_bind(&json!({ - "前端变量": ["title", "body"], - "后端数据库": ["posts.title", "posts.body"], - "绑定css样式": ["t", "b"], - })); - let rows = json!([{"id": 1, "title": "Hello", "body": "World"}]); - let out = project_rows( - binds.as_array().unwrap(), - rows.as_array().unwrap(), - ); - assert_eq!(out[0]["title"], "Hello"); - assert_eq!(out[0]["_css"]["title"], "t"); - assert_eq!(out[0]["_css"]["body"], "b"); - } - - #[test] - fn qualify_bare_columns() { - let binds = as_bind(&json!({ - "前端变量": ["title"], - "后端数据库": ["title"], - "绑定css样式": ["t"], - })); - let q = qualify_binds(binds.as_array().unwrap(), Some("articles")); - assert_eq!(q[0]["back"], "articles.title"); - } - - #[test] - fn as_rows_column_dict() { - let t = json!({ - "title": ["hello", "second"], - "body": ["a", "b"], - }); - let rows = as_rows(&t); - assert_eq!(rows.as_array().unwrap().len(), 2); - assert_eq!(rows[0]["title"], "hello"); - assert_eq!(rows[1]["body"], "b"); - } -} diff --git a/plugins/web/src/theme.css b/plugins/web/src/theme.css deleted file mode 100644 index 16beafb..0000000 --- a/plugins/web/src/theme.css +++ /dev/null @@ -1,509 +0,0 @@ -/* Marqdo Web default theme — semantic / classless shell. - Content kinds: prose, cards, table. No purple/cream-terracotta AI defaults. */ - -:root { - --ink: #1c1917; - --ink-muted: #57534e; - --paper: #fafaf9; - --panel: #ffffff; - --line: #e7e5e4; - --accent: #0f766e; - --accent-hover: #0d9488; - --side-w: 14rem; - --radius: 6px; - --font-display: "Source Serif 4", "Noto Serif SC", Georgia, serif; - --font-ui: "IBM Plex Sans", "Noto Sans SC", "Segoe UI", sans-serif; - --font-mono: "IBM Plex Mono", ui-monospace, monospace; - --space: 1.25rem; - --max-prose: 42rem; -} - -* { - box-sizing: border-box; -} - -html { - font-size: 16px; - -webkit-text-size-adjust: 100%; -} - -body { - margin: 0; - min-height: 100vh; - display: grid; - grid-template-rows: auto 1fr auto; - grid-template-columns: 1fr; - background: var(--paper); - color: var(--ink); - font-family: var(--font-ui); - line-height: 1.55; -} - -body.has-sidebar { - grid-template-columns: var(--side-w) 1fr; - grid-template-areas: - "top top" - "side main" - "foot foot"; -} - -body.no-sidebar { - grid-template-areas: - "top" - "main" - "foot"; -} - -/* —— Shell —— */ -header.topnav { - grid-area: top; - background: var(--panel); - border-bottom: 1px solid var(--line); - padding: 0.85rem var(--space); - position: sticky; - top: 0; - z-index: 10; -} - -aside.side { - grid-area: side; - background: #f5f5f4; - border-right: 1px solid var(--line); - padding: var(--space) 1rem; - min-height: 0; -} - -main.main { - grid-area: main; - padding: calc(var(--space) * 1.25) var(--space) calc(var(--space) * 2); - min-width: 0; -} - -footer.foot { - grid-area: foot; - border-top: 1px solid var(--line); - padding: 0.85rem var(--space); - color: var(--ink-muted); - font-size: 0.9rem; - background: var(--panel); -} - -/* —— Nav links —— */ -ul.nav, -ul.side-nav, -ul.foot-nav { - list-style: none; - margin: 0; - padding: 0; - display: flex; - gap: 0.35rem 1.15rem; - flex-wrap: wrap; - align-items: center; -} - -ul.side-nav { - flex-direction: column; - align-items: stretch; - gap: 0.2rem; -} - -aside.side .side-label { - display: block; - font-size: 0.72rem; - letter-spacing: 0.08em; - text-transform: uppercase; - color: var(--ink-muted); - margin: 0 0 0.65rem; - font-family: var(--font-ui); -} - -ul.nav a, -ul.side-nav a, -ul.foot-nav a { - color: var(--ink); - text-decoration: none; - font-weight: 500; - border-radius: var(--radius); - padding: 0.35rem 0.45rem; -} - -ul.side-nav a { - display: block; - padding: 0.45rem 0.6rem; -} - -ul.nav a:hover, -ul.side-nav a:hover, -ul.foot-nav a:hover { - color: var(--accent); - background: rgba(15, 118, 110, 0.08); -} - -ul.side-nav a[aria-current="page"], -ul.nav a[aria-current="page"] { - color: var(--accent); - background: rgba(15, 118, 110, 0.12); -} - -/* —— Prose (intro / raw main HTML) —— */ -.main-intro, -.content.prose { - max-width: var(--max-prose); - font-family: var(--font-display); - font-size: 1.125rem; -} - -.main-intro h1, -.content.prose h1 { - font-size: 2rem; - line-height: 1.2; - margin: 0 0 0.75rem; - letter-spacing: -0.02em; -} - -.main-intro p, -.content.prose p { - margin: 0 0 1rem; - color: var(--ink-muted); -} - -/* Bound field hooks from `|绑定css样式|` */ -.card-title { - font-family: var(--font-display); -} - -.card-body { - color: var(--ink-muted); -} - -.content.cards { - display: grid; - gap: 1rem; - margin-top: 1.25rem; - grid-template-columns: repeat(auto-fill, minmax(16rem, 1fr)); -} - -.content.cards article { - background: var(--panel); - border: 1px solid var(--line); - border-radius: var(--radius); - padding: 1rem 1.1rem; - box-shadow: 0 1px 0 rgba(28, 25, 23, 0.04); -} - -.content.cards article h2 { - font-family: var(--font-display); - font-size: 1.2rem; - margin: 0 0 0.45rem; - line-height: 1.3; -} - -.content.cards article p { - margin: 0; - color: var(--ink-muted); - font-size: 0.95rem; -} - -.content.cards article .meta { - margin-top: 0.65rem; - font-size: 0.8rem; - color: var(--ink-muted); - font-family: var(--font-mono); -} - -/* —— Table layout —— */ -.content.table-wrap { - margin-top: 1.25rem; - overflow-x: auto; - border: 1px solid var(--line); - border-radius: var(--radius); - background: var(--panel); -} - -.content.table-wrap table { - width: 100%; - border-collapse: collapse; - font-size: 0.95rem; -} - -.content.table-wrap th, -.content.table-wrap td { - padding: 0.55rem 0.75rem; - text-align: left; - border-bottom: 1px solid var(--line); -} - -.content.table-wrap th { - background: #f5f5f4; - font-weight: 600; - font-size: 0.8rem; - text-transform: uppercase; - letter-spacing: 0.04em; - color: var(--ink-muted); -} - -.content.table-wrap tr:last-child td { - border-bottom: 0; -} - -/* —— Simple list —— */ -.content.list { - margin: 1.25rem 0 0; - padding: 0; - list-style: none; - max-width: var(--max-prose); -} - -.content.list li { - padding: 0.65rem 0; - border-bottom: 1px solid var(--line); - font-family: var(--font-display); -} - -/* —— Admin panel —— */ -.admin-page { - max-width: 56rem; -} - -.admin-bar { - display: flex; - flex-wrap: wrap; - align-items: flex-end; - justify-content: space-between; - gap: 1rem; - margin-bottom: 1.25rem; - padding-bottom: 1rem; - border-bottom: 1px solid var(--line); -} - -.admin-crumbs { - margin: 0 0 0.25rem; - font-size: 0.8rem; - color: var(--ink-muted); -} - -.admin-crumbs a { - color: var(--ink-muted); - text-decoration: none; -} - -.admin-crumbs a:hover { - color: var(--accent); -} - -.admin-bar h1 { - margin: 0; - font-family: var(--font-display); - font-size: 1.65rem; - letter-spacing: -0.02em; -} - -.admin-actions { - display: flex; - flex-wrap: wrap; - gap: 0.5rem; -} - -.admin-lead { - margin: 0 0 1rem; - color: var(--ink-muted); -} - -.admin-empty { - color: var(--ink-muted); - padding: 1.5rem 0; -} - -.admin-cards { - display: grid; - gap: 1rem; - grid-template-columns: repeat(auto-fill, minmax(14rem, 1fr)); -} - -.admin-card { - background: var(--panel); - border: 1px solid var(--line); - border-radius: var(--radius); - padding: 1rem 1.1rem; -} - -.admin-card h2 { - margin: 0 0 0.35rem; - font-size: 1.15rem; - font-family: var(--font-display); -} - -.admin-meta { - margin: 0 0 0.85rem; - font-size: 0.85rem; - color: var(--ink-muted); - font-family: var(--font-mono); -} - -.admin-card-actions { - display: flex; - gap: 0.45rem; -} - -.btn, -button.btn { - display: inline-flex; - align-items: center; - justify-content: center; - padding: 0.4rem 0.85rem; - border-radius: var(--radius); - border: 1px solid var(--accent); - background: var(--accent); - color: #fff; - font: inherit; - font-size: 0.9rem; - text-decoration: none; - cursor: pointer; -} - -.btn:hover, -button.btn:hover { - background: var(--accent-hover); - border-color: var(--accent-hover); - color: #fff; -} - -.btn-ghost { - background: transparent; - color: var(--ink); - border-color: var(--line); -} - -.btn-ghost:hover { - background: #f5f5f4; - color: var(--ink); - border-color: var(--line); -} - -.btn-danger { - background: #fff; - color: #b91c1c; - border-color: #fecaca; -} - -.btn-danger:hover { - background: #fef2f2; - color: #991b1b; - border-color: #fecaca; -} - -.btn-small { - padding: 0.25rem 0.55rem; - font-size: 0.8rem; -} - -.col-actions { - white-space: nowrap; - width: 1%; -} - -.inline-form { - display: inline; - margin: 0; -} - -.admin-table th.col-actions { - text-align: right; -} - -.admin-table td.col-actions { - text-align: right; -} - -.admin-form { - max-width: 28rem; -} - -.admin-form-fields { - display: grid; - gap: 0.9rem; -} - -.admin-field { - display: grid; - gap: 0.35rem; -} - -.admin-field span { - font-size: 0.85rem; - font-weight: 600; - color: var(--ink-muted); -} - -.admin-field input, -.admin-field textarea { - width: 100%; - padding: 0.5rem 0.65rem; - border: 1px solid var(--line); - border-radius: var(--radius); - font: inherit; - background: var(--panel); - color: var(--ink); -} - -.admin-field input:focus, -.admin-field textarea:focus { - outline: 2px solid color-mix(in srgb, var(--accent) 35%, transparent); - border-color: var(--accent); -} - -.admin-form-footer { - display: flex; - gap: 0.5rem; - margin-top: 1.25rem; -} - -.log-action { - font-family: var(--font-mono); - font-size: 0.85rem; -} - -.log-create { - color: #0f766e; -} - -.log-update { - color: #a16207; -} - -.log-delete { - color: #b91c1c; -} - -aside.side .side-label { - margin-bottom: 0.5rem; -} - -a { - color: var(--accent); -} - -a:hover { - color: var(--accent-hover); -} - -@media (max-width: 720px) { - body.has-sidebar { - grid-template-columns: 1fr; - grid-template-areas: - "top" - "side" - "main" - "foot"; - } - - aside.side { - border-right: 0; - border-bottom: 1px solid var(--line); - } - - ul.side-nav { - flex-direction: row; - flex-wrap: wrap; - } -} diff --git a/src/host/plugin.rs b/src/host/plugin.rs index 5c8d4bd..28152df 100644 --- a/src/host/plugin.rs +++ b/src/host/plugin.rs @@ -1,6 +1,6 @@ //! Native plugin loader (C ABI v1/v2). Shared libs are not linked into marqdo. -use std::cell::Cell; +use std::cell::{Cell, RefCell}; use std::collections::HashMap; use std::ffi::{CStr, CString}; use std::os::raw::{c_char, c_int, c_void}; @@ -54,6 +54,24 @@ struct MarqdoHostApi { thread_local! { /// Set around plugin calls so `host_query` can read entry source / call site. static CURRENT_HOST: Cell<*const HostContext> = const { Cell::new(std::ptr::null()) }; + /// Optional `lib.member` resolver for `host_query("call_lib_path")` (site entry module). + static LIB_PATH_CALL: RefCell> = const { RefCell::new(None) }; +} + +/// Hook: resolve bare `lib.member` (and longer paths) in the site module's import tree. +pub struct LibPathCall { + pub call: fn(*mut (), &str) -> Result, + pub data: *mut (), +} + +/// Run `body` with a temporary lib-path call hook (nested-safe). +pub fn with_lib_path_call(hook: LibPathCall, body: impl FnOnce() -> R) -> R { + LIB_PATH_CALL.with(|slot| { + let prev = slot.replace(Some(hook)); + let out = body(); + slot.replace(prev); + out + }) } struct RegisterBuf { @@ -205,7 +223,7 @@ unsafe extern "C" fn host_register( unsafe extern "C" fn host_query( _userdata: *mut c_void, name: *const c_char, - _args_json: *const c_char, + args_json: *const c_char, out_json: *mut *mut c_char, err_msg: *mut *mut c_char, ) -> c_int { @@ -239,6 +257,15 @@ unsafe extern "C" fn host_query( } let ctx = &*ctx_ptr; + let args_owned: Option = if args_json.is_null() { + None + } else { + CStr::from_ptr(args_json) + .to_str() + .ok() + .map(|s| s.to_string()) + }; + let result = match name { "module_source" => agent_rt::module_source(ctx).and_then(|v| value_to_json(&v)), "call_site" => agent_rt::call_site(ctx, Some(ctx.current_line)).and_then(|v| value_to_json(&v)), @@ -246,6 +273,28 @@ unsafe extern "C" fn host_query( "cwd" => Ok(serde_json::Value::String( ctx.cwd.to_string_lossy().into_owned(), )), + "call_lib_path" => (|| { + let raw = args_owned.as_deref().unwrap_or("{}"); + let args: serde_json::Value = serde_json::from_str(if raw.trim().is_empty() { + "{}" + } else { + raw + }) + .map_err(|e| format!("call_lib_path args: {e}"))?; + let path = args + .get("path") + .and_then(|v| v.as_str()) + .ok_or_else(|| "call_lib_path requires `path`".to_string())? + .to_string(); + LIB_PATH_CALL.with(|slot| { + let hook = slot.borrow(); + let hook = hook + .as_ref() + .ok_or_else(|| "call_lib_path: no site lib resolver".to_string())?; + let v = (hook.call)(hook.data, &path)?; + value_to_json(&v) + }) + })(), other => Err(format!("host_query: unknown `{other}`")), }; diff --git a/src/interp.rs b/src/interp.rs index 13ee34c..1e29c73 100644 --- a/src/interp.rs +++ b/src/interp.rs @@ -28,6 +28,8 @@ pub struct Interpreter { input: InputFeed, host: HostContext, debug: Option>, + /// Entry module pointer for `host_query("call_lib_path")` while plugins run. + site_module: Option<*const Module>, } struct Env { @@ -50,7 +52,7 @@ impl Env { } } -enum EvArg { +pub(crate) enum EvArg { Positional(Value), Named(String, Value), } @@ -66,6 +68,7 @@ impl Interpreter { input: InputFeed::new(false, Vec::new()), host: HostContext::for_run(path, Default::default(), Vec::new()), debug: None, + site_module: None, } } @@ -79,6 +82,7 @@ impl Interpreter { input: InputFeed::new(true, Vec::new()), host: HostContext::for_capture(path, Default::default()), debug: None, + site_module: None, } } @@ -140,19 +144,70 @@ impl Interpreter { } pub fn run_module(&mut self, module: &Module) -> Result { - if let Some(main) = find_top(module, "main") { - return self.run_function(module, main, Env::new(), &[]); - } - // Document-as-entry: sole top-level `#` object with no params (e.g. `# Hello World`). - let entries: Vec<&Function> = module - .functions - .iter() - .filter(|f| f.is_object() && f.params.is_empty()) + let prev = self.site_module; + self.site_module = Some(module as *const Module); + let result = (|| { + if let Some(main) = find_top(module, "main") { + return self.run_function(module, main, Env::new(), &[]); + } + // Document-as-entry: sole top-level `#` object with no params (e.g. `# Hello World`). + let entries: Vec<&Function> = module + .functions + .iter() + .filter(|f| f.is_object() && f.params.is_empty()) + .collect(); + if entries.len() == 1 { + return self.run_function(module, entries[0], Env::new(), &[]); + } + bail!("no `# main` object to run"); + })(); + self.site_module = prev; + result + } + + /// Resolve `lib.member` on the site (entry) module — used by ABI `call_lib_path`. + pub(crate) fn call_site_lib_path(&mut self, path: &str) -> std::result::Result { + let site = self + .site_module + .ok_or_else(|| "call_lib_path: no site module".to_string())?; + let site = unsafe { &*site }; + let parts: Vec = path + .split('.') + .map(|s| s.trim().to_string()) + .filter(|s| !s.is_empty()) .collect(); - if entries.len() == 1 { - return self.run_function(module, entries[0], Env::new(), &[]); + if parts.len() < 2 { + return Err(format!( + "call_lib_path: need `lib.member`, got `{path}`" + )); } - bail!("no `# main` object to run"); + self.eval_path_call(site, &parts, &[]) + .map_err(|e| e.to_string()) + } + + fn call_plugin_registered( + &mut self, + name: &str, + bound: &HashMap, + ) -> std::result::Result { + struct HookData { + interp: *mut Interpreter, + } + fn trampoline(data: *mut (), path: &str) -> std::result::Result { + let data = unsafe { &mut *(data as *mut HookData) }; + let interp = unsafe { &mut *data.interp }; + interp.call_site_lib_path(path) + } + let mut data = HookData { + interp: self as *mut Interpreter, + }; + let hook = crate::host::plugin::LibPathCall { + call: trampoline, + data: &mut data as *mut HookData as *mut (), + }; + crate::host::plugin::with_lib_path_call(hook, || { + crate::host::plugin::call_registered(&self.host, name, bound) + }) } fn run_function( @@ -636,7 +691,8 @@ impl Interpreter { if let Some(reg) = self.host.plugins.get(&call.callee).cloned() { let bound = bind_args(®.params, &ev_args, false).map_err(|m| self.err(m))?; - return crate::host::plugin::call_registered(&self.host, &call.callee, &bound) + return self + .call_plugin_registered(&call.callee, &bound) .map_err(|m| self.err(m)); } @@ -662,7 +718,7 @@ impl Interpreter { } /// Resolve bare path `lib.member` / `lib.Type.member` (definition-tree addressing). - fn eval_path_call( + pub(crate) fn eval_path_call( &mut self, module: &Module, path: &[String], diff --git a/tests/ext/web-fixtures/components/foot.mq.md b/tests/ext/web-fixtures/components/foot.mq.md new file mode 100644 index 0000000..2817405 --- /dev/null +++ b/tests/ext/web-fixtures/components/foot.mq.md @@ -0,0 +1,9 @@ +## foot + +`foot` = + +| 属性 | 值 | 样式 | +|------|-----|------| +| Foot | / | | + +**`foot`** diff --git a/tests/ext/web-fixtures/components/nav.mq.md b/tests/ext/web-fixtures/components/nav.mq.md new file mode 100644 index 0000000..cc8b431 --- /dev/null +++ b/tests/ext/web-fixtures/components/nav.mq.md @@ -0,0 +1,10 @@ +## nav + +`nav` = + +| 属性 | 值 | 样式 | +|------|-----|------| +| Home | / | | +| Docs | /docs | | + +**`nav`** diff --git a/tests/ext/web-fixtures/components/side.mq.md b/tests/ext/web-fixtures/components/side.mq.md new file mode 100644 index 0000000..ee4407f --- /dev/null +++ b/tests/ext/web-fixtures/components/side.mq.md @@ -0,0 +1,9 @@ +## side + +`side` = + +| 属性 | 值 | 样式 | +|------|-----|------| +| Side | / | | + +**`side`** diff --git a/tests/ext/web-fixtures/db/articles.mq.md b/tests/ext/web-fixtures/db/articles.mq.md new file mode 100644 index 0000000..471a84a --- /dev/null +++ b/tests/ext/web-fixtures/db/articles.mq.md @@ -0,0 +1,22 @@ +## schema + +`fields` = + +| 字段 | 类型 | 可空 | +|------|------|------| +| id | integer | false | +| title | text | false | +| body | text | true | + +**`fields`** + +## seed + +`rows` = + +| id | title | body | +|----|-------|------| +| 1 | Hello Marqdo | First article from a GFM table. | +| 2 | Code as docs | The page table is the program. | + +**`rows`** diff --git a/tests/ext/web-fixtures/styles/shell.mq.md b/tests/ext/web-fixtures/styles/shell.mq.md new file mode 100644 index 0000000..999405a --- /dev/null +++ b/tests/ext/web-fixtures/styles/shell.mq.md @@ -0,0 +1,39 @@ +## topnav + +`topnav` = + +| 属性 | 值 | +|------|-----| +| background | #fff | + +**`topnav`** + +## side_panel + +`side_panel` = + +| 属性 | 值 | +|------|-----| +| background | #f5f5f4 | + +**`side_panel`** + +## card_title + +`card_title` = + +| 属性 | 值 | +|------|-----| +| font-weight | 600 | + +**`card_title`** + +## card_body + +`card_body` = + +| 属性 | 值 | +|------|-----| +| color | #57534e | + +**`card_body`** diff --git a/tests/ext/web-smoke.mq.md b/tests/ext/web-smoke.mq.md index a3e5cc7..f9be7c8 100644 --- a/tests/ext/web-smoke.mq.md +++ b/tests/ext/web-smoke.mq.md @@ -1,104 +1,75 @@ --- -title: ext/web smoke (offline) -description: Variable-name tables + page region methods. +title: web assemble smoke +description: Offline assemble + render markers (no listen). > ext/web/web.mq.md +> web-fixtures/styles/shell.mq.md as shell +> web-fixtures/components/nav.mq.md as nav +> web-fixtures/components/side.mq.md as side +> web-fixtures/components/foot.mq.md as foot +> web-fixtures/db/articles.mq.md as articles +> lib/fs.mq.md > lib/json.mq.md -> lib/sys.mq.md --- # main -> web.ensure_plugin - -`nav` = - -| 前端变量 | 后端数据库 | 绑定css样式 | -|----------|------------|-------------| -| 首页 | / | | -| 文档 | /docs | | - -*`links` = > web.as_links table=`nav` * -*`ln` = > len value=`links` * -1. `ln` == 2 - > print text=nav-ok -2. * - > print text=nav-bad - -- [`项`](`links`) - *`名` = > json.get value=`项` key=label * - > print text=`名` - -*`binds` = > web.as_bind table=`nav` * -*`bn` = > len value=`binds` * -1. `bn` == 2 - > print text=bind-ok -2. * - > print text=bind-bad - -*`page` = > web.page title=Smoke * -*`page` = > `page`.nav table=`nav` * -*`html` = > `page`.render * -*`parts` = > split value=`html` sep=首页 * -*`n` = > len value=`parts` * -1. `n` > 1 - > print text=render-ok -2. * - > print text=render-bad - -*`dir` = > sys.env_get name=TMPDIR * -1. `dir` +*`store` = > web.db url="sqlite:web-fixtures/data/smoke.db" * +*`fields` = > articles.schema * +> `store`.init name=articles fields=`fields` +*`rows` = > `store`.select table=articles limit=1 * +1. `rows` *`_` = 1* 2. * - *`dir` = /tmp * -*`slash` = > json.parse text={"a":"/mq-web-gold-"} * -*`a` = > json.get value=`slash` key=a * -*`pid` = > sys.env_get name=USER * -*`dbpath` = `dir` + `a` + `pid` + ".db" * -*`url` = "sqlite:" + `dbpath` * -*`db` = > web.db url=`url` * + *`seed` = > articles.seed * + > `store`.insert table=articles rows=`seed` -`articles` = +`home` = -| 字段 | 类型 | 可空 | -|------|------|------| -| id | integer | false | -| title | text | false | +| 组件 | 样式 | +|------|------| +| nav.`nav` | shell.`topnav` | +| side.`side` | shell.`side_panel` | +| foot.`foot` | | -*`articles` = > `db`.init name=articles fields=`articles` * +`index` = -`种子` = +| 属性 | 值 | 样式 | +|------|-----|------| +| `title` | articles.`articles`.title | shell.`card_title` | +| `body` | articles.`articles`.body | shell.`card_body` | -| @ | title | -|---|-------| -| 1 | hello | +*`page` = > web.page title="smoke" intro="

smoke

" * +*`page` = > `page`.compose_components components=`home` * +*`page` = > `page`.compose_main main=`index` * +*`html` = > `page`.render db=`store` * -> `db`.insert table=`articles` rows=`种子` - -`主体` = - -| 前端变量 | 后端数据库 | 绑定css样式 | -|----------|------------|-------------| -| title | title | card-title | - -*`page` = > web.page title=Smoke db_url=`url` * -*`page` = > `page`.nav table=`nav` * -*`page` = > `page`.main table=`articles` bind=`主体` intro="

Smoke

" * -*`html2` = > `page`.render * -*`parts2` = > split value=`html2` sep=hello * -*`n2` = > len value=`parts2` * -1. `n2` > 1 - > print text=live-ok +1. `html` + > print text=render-ok 2. * - > print text=live-bad + > print text=render-fail -*`文章` = > `db`.follow table=`articles` * -*`page` = > web.page title=Smoke * -*`page` = > `page`.nav table=`nav` * -*`page` = > `page`.follow name=main live=`文章` * -*`html3` = > `page`.render * -*`parts3` = > split value=`html3` sep=hello * -*`n3` = > len value=`parts3` * -1. `n3` > 1 - > print text=follow-ok +*`nav` = > json.get value=`page` key=nav * +1. `nav` + > print text=compose-nav-ok 2. * - > print text=follow-bad + > print text=compose-nav-fail + +*`css` = > json.get value=`page` key=styles_css * +1. `css` + > print text=styles-ok +2. * + > print text=styles-fail + +*`parts` = > json.get value=`page` key=parts * +*`index_part` = > json.get value=`parts` key=index * +1. `index_part` + > print text=compose-ok +2. * + > print text=compose-fail + +*`got` = > `store`.get table=articles id=1 * +*`title` = > json.get value=`got` key=title * +1. `title` == "Hello Marqdo" + > print text=db-ok +2. * + > print text=db-fail diff --git a/tests/gold.rs b/tests/gold.rs index 20a185f..1eeaf79 100644 --- a/tests/gold.rs +++ b/tests/gold.rs @@ -1232,13 +1232,11 @@ fn ext_web_smoke() { assert!(status.success(), "failed to build marqdo_plugin_web"); assert_out( "tests/ext/web-smoke.mq.md", - "nav-ok -首页 -文档 -bind-ok -render-ok -live-ok -follow-ok", + "render-ok +compose-nav-ok +styles-ok +compose-ok +db-ok", ); }