diff --git a/.cursor/skills/marqdo/SKILL.md b/.cursor/skills/marqdo/SKILL.md index 0cdf965..4de0f65 100644 --- a/.cursor/skills/marqdo/SKILL.md +++ b/.cursor/skills/marqdo/SKILL.md @@ -334,7 +334,7 @@ Examples: [linalg-svd](../../examples/linalg-svd/) · [linalg-least-squares](../ | Import `lib/text` then call bare `split` | `> text.split …` (qualified) | | Import `lib/text` then call `拆分` | Match file language (`text.split`, not 文本) | | `json.set` / `json.append` to build maps or lists | GFM tables; sparse `table.put`; named helpers (`browser.*`, `web.*`) | -| `json.set` to build page parts | GFM tables + `page.compose_*` / `web.page` methods | +| `json.set` / `compose_*` page parts | `type: web` Document + View table / `web.render` / `web.serve` | | Import `json` for every browser handler | `import browser:lib/browser.mq.md` + tables ([marqdo-dev](../marqdo-dev/SKILL.md)) | | Mix `web.page` and `网页.页面` in one file | One import language per `.mq.md` | | Call `host_web_*` from `ext/web` | Use `# app` / `# db` methods; plugin ABI only | diff --git a/CHANGELOG.md b/CHANGELOG.md index 5ef8157..7edd95d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,9 +10,10 @@ - **规则**:`.cursor/rules/web-artifact-no-degrade.mdc`;设计 `doc/design/ext-web-artifact.md`。 ### Fixed +- Document `data_source` / `data_where` now drive list cards and detail articles under `web.serve` (ADR 0007 flat metadata). ### Changed -- **破坏性**:删除作者面 `compose_*` / `app.configure` / 作者 `ensure_plugin`。旧 web gold 标 `#[ignore]`;新金样 `web-artifact-*`。 +- **破坏性**:删除作者面 `compose_*` / `app.configure` / 作者 `ensure_plugin`。旧 web gold 已移除;新金样 `web-artifact-*` / `ext_web_*`。 - **核心表面 Δ**:**无增删**(复用 Metadata `type`)。 - 修订 `ext-web.md` C1;`doc/next/007.md` superseded。 diff --git a/README.md b/README.md index e0824ed..4bdaec1 100644 --- a/README.md +++ b/README.md @@ -154,7 +154,7 @@ marqdo catalog public -o .marqdo - **`marqdo version --check`**:与 GitHub 最新 release 对比 - 标准库:**内置于二进制**(v0.1.2+);磁盘 `lib/` 或 `MARQDO_LIB` 可覆盖。模块含文本、表、**浏览器效应**、文件、系统、时间、JSON、网络、数学、外联、插件、**自写回**、**子任务**;**中层 Mid M1–M6** + **Mid2 M7–M10**(datetime/url/toml/html/fs++/stats/log.fields 等,见 [stdlib-mid.md](doc/design/stdlib-mid.md) · [stdlib-mid2.md](doc/design/stdlib-mid2.md)) - **官方扩展库 `ext/`**(**非** stdlib,本版收口): - - **`web`**:W0–W7 + P3 + **W8**;**定制 C0–C4**;**宿主 H1–H2**(`proxy`/`invoke`,见 [ext-hosting.md](doc/roadmap/ext-hosting.md));**表驱动引言**(`compose_intro` / `引言装配`);原生层默认 **Go `libweb`**([ADR 0004](doc/adr/0004-web-plugin-go.md),`scripts/build-web-plugin.sh`);示例 [web-site](examples/web-site/) · [web-site-zh](examples/web-site-zh/) · [marqdo-blog](examples/marqdo-blog/) · [anlian-mq](examples/anlian-mq/);生产路径见 [web-asgi-servers-and-marqdo.md](doc/design/web-asgi-servers-and-marqdo.md) + - **`web`**:**Artifact 模型(ADR [0007](doc/adr/0007-web-document-endpoint.md))** — `type: web|endpoint` Document/Endpoint;facade `page`/`route`/`serve`/`render`/`inspect`/`use`;Resource 在 `ext/data` · `ext/security` · `ext/net`;设计 [ext-web-artifact.md](doc/design/ext-web-artifact.md);原生 **Go `libweb`**([ADR 0004](doc/adr/0004-web-plugin-go.md));示例 [marqdo-blog](examples/marqdo-blog/) · [web-client-site](examples/web-client-site/) · [anlian-mq](examples/anlian-mq/) - **`quantum`**:Q0–Q7 + Q8a/b 主题 SVG;示例 [quantum-entanglement](examples/quantum-entanglement/) - **`linalg`**:L0–L6 + 公式文档面(中缀 / `declare` / 展示化简);示例 [linalg-transpose](examples/linalg-transpose/) · [linalg-svd](examples/linalg-svd/) · [linalg-least-squares](examples/linalg-least-squares/) - **`agent`**:A1–A4 + **MCP Server/Client stdio** + Skill Compilation + Adaptive Routing + resume;宿主缺口见 [ext-hosting.md](doc/roadmap/ext-hosting.md) · [agent-framework-gaps-after-a4.md](doc/research/agent-framework-gaps-after-a4.md) @@ -211,7 +211,7 @@ marqdo ext add llm # 或:大模型(.mq.md + 可选 native llm) # 4) 动态站示例(扩展装好后) marqdo run examples/web-site-zh/index.mq.md # 表驱动引言 Demo -marqdo run examples/marqdo-blog/index.mq.md +marqdo run examples/marqdo-blog/serve.mq.md marqdo run examples/anlian-mq/index.mq.md # W-G14 验收站 # 浏览器打开终端打印的 listen 地址;/favicon.ico 与 logo 装配见 W8 diff --git a/doc/design/ext-web-artifact.md b/doc/design/ext-web-artifact.md index 565a666..2eb8fb1 100644 --- a/doc/design/ext-web-artifact.md +++ b/doc/design/ext-web-artifact.md @@ -125,6 +125,8 @@ import data:ext/data/db.mq.md 正文在请求时执行;返回值按 `response` 序列化。Result 协议见 §8。 +**Handler 约定(锁定)**:Endpoint 文件用 `# main` 作为请求处理器。请求体/query/path 参数经 `run_artifact` 以 Metadata Binding 覆盖注入(与 `--bind` 同源),正文用已提升的普通变量名。无 `# main` 时返回 Artifact Result 摘要(`ok`/`value`/`error`),适合作文档型 ping。 + --- ## 5. Facade API(EN / ZH) diff --git a/doc/design/web-net-capabilities.md b/doc/design/web-net-capabilities.md index 8706781..b519f27 100644 --- a/doc/design/web-net-capabilities.md +++ b/doc/design/web-net-capabilities.md @@ -2,16 +2,23 @@ | | | |---|---| -| 状态 | **Accepted · W0–W7 + P3 完结**(2026-08-28 复核) | -| 日期 | 2026-08-26(初稿)· 2026-08-28(完结复核) | -| 相关 | [ext-web.md](ext-web.md) · [ext-web-net.md](ext-web-net.md) · [ext-abi.md](ext-abi.md) · [stdlib-modules.md](stdlib-modules.md) | -| 目标 | 盘点 `ext/web` + `plugins/web` + `lib/net` 现状,对照主流语言网络栈,给出「开发一个完整 Web 项目」所需能力的差距清单与补强路线 | +| 状态 | **Historical capability matrix** — 作者面以 **[ext-web-artifact.md](ext-web-artifact.md)** / ADR [0007](../adr/0007-web-document-endpoint.md) 为准(2026-09-28) | +| 日期 | 2026-08-26(初稿)· 2026-08-28(完结复核)· 2026-09-28(Artifact 标注) | +| 相关 | [ext-web-artifact.md](ext-web-artifact.md) · [ext-web.md](ext-web.md) · [ext-web-net.md](ext-web-net.md) · [ext-abi.md](ext-abi.md) · [stdlib-modules.md](stdlib-modules.md) | +| 目标 | 盘点 `ext/web` + `plugins/web` + `lib/net` 现状;**下文 API 名多为 W0–W7 历史面**(`compose_*` / `configure` 已废止) | + +> **2026-09-28**:作者面迁移到 Document / Endpoint / Resource。 +> - Document/Endpoint:`type: web|endpoint` + `web.serve` / `web.render` / `web.inspect` +> - DB/cache/storage → `ext/data`;auth/oidc/rbac → `ext/security`;ws → `ext/net` +> - 统一 View:`|type|slot|value|attrs|style|`;中间件:`web.use` +> 本文件保留为**原生能力矩阵**对照,勿再按 `compose_*` / `app.configure` 写作。 --- ## 0. 一句话结论 -**`ext/web` + `plugins/web` 已完成 W0–W7 + P3 路线图**:中间件/JSON API、数据层(连接池/事务/分页/FTS/迁移/外键/审计时间戳)、安全硬化(argon2/CSRF/会话持久化/限速/RBAC)、内容站点标配(SEO/RSS/Markdown/分页 UI)、上传下载/相册/ETag、sitemap/robots/错误页/重定向、WebSocket 广播与访问日志。足以在 Marqdo 上实现博客/CMS/中小型 API 站点;**未内置**的仅剩标签页模板(D6,可用路由+`db.count` 自建)与应用层反垃圾。边界不变:**纯解析进 `lib/net`,HTTP 服务器与领域能力进 `plugins/web` + `ext/web` 作者面**。 +**能力层(plugins/web)**:中间件/JSON API、数据层、安全、内容站点、上传下载、sitemap、WebSocket 等仍在原生实现中。 +**作者面(2026-09-28)**:改为 Artifact Metadata + facade;`compose_*` / `configure` **已删除**。边界不变:**纯解析进 `lib/net`,HTTP 服务器进 `plugins/web`,作者 API 进 `ext/web` + `ext/data` + `ext/security` + `ext/net`**。 **宿主集成下一刀**(同域 LLM SSE 中继、HTTP→用户 `##`、与 MCP Server 协作)不在本 W 表内,见 [ext-hosting-gaps.md](../research/ext-hosting-gaps.md) · [ext-hosting-fill.md](ext-hosting-fill.md) · [ext-hosting.md](../roadmap/ext-hosting.md)。 diff --git a/doc/tutorial/14-网络与Web扩展.md b/doc/tutorial/14-网络与Web扩展.md index 6313a3b..9c8588c 100644 --- a/doc/tutorial/14-网络与Web扩展.md +++ b/doc/tutorial/14-网络与Web扩展.md @@ -70,107 +70,111 @@ import net:lib/net.mq.md > print text=[name](`field`) ``` -## 14.3 网页应用(`ext/web`) +## 14.3 网页应用(Artifact · ADR 0007) -`ext/web` 用类 + 方法装配页面。导入 `web:ext/web/web.mq.md`(中文 `网页:ext/web/网页.mq.md`)。 +站点是一堆 `.mq.md`:**Document**(`type: web`)与 **Endpoint**(`type: endpoint`)。入口调用 `web.serve` 扫描目录并监听。完整设计见 [ext-web-artifact.md](../design/ext-web-artifact.md);示例 [marqdo-blog](../../examples/marqdo-blog/)。 -### 页面、组件、主体 +### Document 首页 ```markdown --- +type: web +title: 我的站点 +route: / +method: GET +data_source: posts +data_order: -created_at import web:ext/web/web.mq.md --- +# 我的站点 + +欢迎。下方卡片列表由 `data_source` 在服务时从数据库加载。 +``` + +### Endpoint + +```markdown +--- +type: endpoint +method: GET +path: /api/ping +request: none +response: json +--- + # main -`首页` = +`out` = -| 组件 | 样式 | -|------|------| -| nav.`导航` | shell.`顶栏` | +| ok | service | +|----|---------| +| True | demo | -**page = > web.page title="我的站点" intro="

你好

"** -**page = > `page`.compose_components components=`首页`** -**html = > `page`.render** +*out* +``` + +### 服务入口 + +```markdown +--- +import web:ext/web/web.mq.md +import posts:db/posts.mq.md +--- + +# main + +**store = > posts.open url="sqlite:data/site.db"** +> web.serve root="." host="127.0.0.1" port=18081 db=`store` static_dir="public" +``` + +离线预览可用 View 表 + `web.render`: + +```markdown +`nodes` = + +| type | slot | value | attrs | style | +|------|------|-------|-------|-------| +| title | title | Marqdo | | title | + +**html = > web.render nodes=`nodes` title="preview"** > print text=`html` ``` -### 应用 + 路由 + 监听 +### 数据库(`ext/data`) ```markdown -**app = > web.app page=`page` host=127.0.0.1 port=18081** -**app = > `app`.route path="/about" page=`关于`** -> web_listen app=`app` -``` +--- +import data:ext/data/db.mq.md +--- -`listen` 提供 `/`、路由页、表单端点 `/_form/{id}`、可选静态目录与 `/admin`。 +# main -### 数据库(SQLite) - -```markdown -**store = > web.db url="sqlite:site.db"** +**store = > data.db url="sqlite:site.db"** > `store`.init name=articles fields=`字段表` > `store`.insert table=articles rows=`数据` **rows = > `store`.select table=articles limit=10** -- [行](rows) - > print text=[title](`行`) ``` -## 14.4 登录鉴权(session / cookie) +## 14.4 鉴权(`ext/security`) -给 `/admin*` 加登录门禁:`app.auth` 挂用户表,未登录重定向到 `/admin/login`。 +HTTP 门禁与登录走 `ext/security`(`auth` / `rbac` / `oidc`),再用 `web.use` 挂中间件表;勿再写 `app.configure`。独立脚本可用: ```markdown -`管理员` = +--- +import rbac:ext/security/rbac.mq.md +--- -| 行 | 用户名 | 密码 | -|----|--------|------| -| 1 | admin | secret | -| 2 | 站长 | pw123 | +# main -**app = > web.app page=`page` admin=True** -**app = > `app`.auth users=`管理员` session_ttl=3600** -> web_listen app=`app` +**gate = > rbac.rbac** +**r = > `gate`.can permissions="desk:access" needed="desk:access"** +> print text=[allowed](`r`) ``` -`session_ttl` 是会话有效期(秒),过期后重新登录。 +## 14.5 WebSocket(`ext/net`) -**独立鉴权工具** `web.auth`:登录、校验、登出(不依赖页面),返回 `{ok, session_id, username}`: - -```markdown -**auth = > web.auth users=`管理员` session_ttl=3600** -**login = > `auth`.login username="admin" password="secret"** -1. [ok](`login`) - > print text=登录成功:[username](`login`) -2. * - > print text=登录失败 - -**sid = [session_id](login)** -**check = > `auth`.check session_id=`sid`** -> print text=[username](`check`) - -> `auth`.logout session_id=`sid` -``` - -## 14.5 WebSocket - -`app.route_ws` 注册端点,`web.ws.connect` 单次请求–响应: - -```markdown -**app = > `app`.route_ws path="/live" echo=True** -> web_listen app=`app` -``` - -客户端(另开终端): - -```markdown -**ws = > web.ws timeout_sec=30** -**echo = > `ws`.connect url="ws://127.0.0.1:18081/live" message="hi"** -1. [ok](`echo`) - > print text=[messages](`echo`) -2. * - > print text=连接失败:[error](`echo`) -``` +实时能力在 `ext/net`(如 `websocket`),与 Document 站点并列导入,不再挂在 `web.app` 的 junk drawer 上。 ## 14.6 字典操作:用表格与取元,不用 `json.get`/`json.set` diff --git a/examples/marqdo-blog/README.md b/examples/marqdo-blog/README.md index ee228df..aa6b1b4 100644 --- a/examples/marqdo-blog/README.md +++ b/examples/marqdo-blog/README.md @@ -1,28 +1,39 @@ # examples/marqdo-blog -Marqdo **Web Artifact** 示例(ADR 0007):`.mq.md` 即文档、即路由、即页面。 +Marqdo **Web Artifact** blog (ADR 0007). -## 运行 +## Layout + +```text +index.mq.md # type: web · / · data_source: posts +pages/about.mq.md # 类型: 网页 · /about +pages/post.mq.md # type: web · /post/{slug} · data_where +api/ping.mq.md # type: endpoint · GET /api/ping +api/echo.mq.md # type: endpoint · POST /api/echo +db/posts.mq.md # ext/data schema + seed + open +public/ # static (mounted at /static) +serve.mq.md # web.serve + db open +smoke.sh # curl checks against a running serve +``` + +## Run ```bash bash scripts/build-web-plugin.sh -# 若 ~/.marqdo/ext 仍是旧 compose_* 面:export MARQDO_EXT=$PWD/ext -cargo run -- run examples/marqdo-blog/serve.mq.md +export MARQDO_EXT=$PWD/ext # if ~/.marqdo/ext is stale +export MARQDO_WEB_PLUGIN=$PWD/plugins/web/build/libweb.so +cd examples/marqdo-blog && marqdo run serve.mq.md +# other terminal: +bash examples/marqdo-blog/smoke.sh ``` -打开 http://127.0.0.1:18081/: +| Path | Artifact | +|------|----------| +| `/` | Document home + post cards | +| `/about` | ZH Document | +| `/post/{slug}` | Document detail | +| `/api/ping` | Endpoint JSON | +| `/api/echo` | Endpoint JSON echo | +| `/static/*` | public assets | -| 路径 | 来源 | -|------|------| -| `/` | `index.mq.md`(`type: web` / 本例中文 `serve` 扫描) | -| `/about` | `pages/about.mq.md`(`类型: 网页`) | -| `/api/ping` | `api/ping.mq.md`(`type: endpoint`) | - -## 设计(代码即文档) - -- **Document** — frontmatter `type`/`类型` + Markdown 正文。 -- **Endpoint** — `type: endpoint` + 可执行正文。 -- **发现** — `网页.服务` / `web.serve root=` 扫描目录内 Artifact。 -- **Resource** — DB 等见 `ext/data`(本示例入口以 Document 为主)。 - -规范:[ext-web-artifact.md](../../doc/design/ext-web-artifact.md) · ADR [0007](../../doc/adr/0007-web-document-endpoint.md)。 +Design: [ext-web-artifact.md](../../doc/design/ext-web-artifact.md). diff --git a/examples/marqdo-blog/api/echo.mq.md b/examples/marqdo-blog/api/echo.mq.md new file mode 100644 index 0000000..7348d76 --- /dev/null +++ b/examples/marqdo-blog/api/echo.mq.md @@ -0,0 +1,25 @@ +--- +type: endpoint +method: POST +path: /api/echo +request: json +response: json +auth: none +--- + +# main + +Echo request fields bound via Artifact Metadata (`arg` overlays). + +**msg = message** +1. not `msg` + **msg = ""** +2. * + +`out` = + +| ok | message | +|----|---------| +| True | `msg` | + +*out* diff --git a/examples/marqdo-blog/api/ping.mq.md b/examples/marqdo-blog/api/ping.mq.md index a2537be..c6f824d 100644 --- a/examples/marqdo-blog/api/ping.mq.md +++ b/examples/marqdo-blog/api/ping.mq.md @@ -4,6 +4,16 @@ method: GET path: /api/ping request: none response: json +auth: none +description: Health ping — documentation is the API (ADR 0007). --- -Ping endpoint — documentation is the API. +# main + +`out` = + +| ok | service | +|----|---------| +| True | marqdo-blog | + +*out* diff --git a/examples/marqdo-blog/db/index.mq.md b/examples/marqdo-blog/db/index.mq.md deleted file mode 100644 index 69d7ba7..0000000 --- a/examples/marqdo-blog/db/index.mq.md +++ /dev/null @@ -1,28 +0,0 @@ ---- -title: db/index -description: 打开 sqlite、建三张表、幂等种子。 -导入 网页:ext/web/网页.mq.md -import schema:schema.mq.md -import seed:seed.mq.md ---- - -## 打开 - -**store = > 网页.数据库 地址="sqlite:data/marqdo-blog.db"** -**字段 = > schema.posts** -**标签字段 = > schema.tags** -**关联字段 = > schema.post_tags** -> `store`.初始化 名=posts 字段=`字段` -> `store`.初始化 名=tags 字段=`标签字段` -> `store`.初始化 名=post_tags 字段=`关联字段` -**行 = > store.查询 表="posts" 上限=1** -1. `行` - *store* -2. * - **文章 = > seed.posts** - **标签 = > seed.tags** - **关联 = > seed.post_tags** - > `store`.插入 表=posts 行=`文章` - > `store`.插入 表=tags 行=`标签` - > `store`.插入 表=post_tags 行=`关联` - *store* \ No newline at end of file diff --git a/examples/marqdo-blog/db/posts.mq.md b/examples/marqdo-blog/db/posts.mq.md new file mode 100644 index 0000000..e70520e --- /dev/null +++ b/examples/marqdo-blog/db/posts.mq.md @@ -0,0 +1,44 @@ +--- +title: blog posts schema +import data:ext/data/db.mq.md +--- + +## schema + +`fields` = + +| 字段 | 类型 | 可空 | +|------|------|------| +| title | text | False | +| slug | text | False | +| summary | text | True | +| content | text | True | +| tag | text | True | +| created_at | text | True | + +*fields* + +## seed + +`rows` = + +| title | slug | summary | content | tag | created_at | +|-------|------|---------|---------|-----|------------| +| Hello Marqdo | hello | Welcome | # Hello\n\nExecutable documents. | intro | 2026-09-01 | +| Artifact Web | artifact-web | Document first | Pages are mq.md files. | design | 2026-09-28 | + +*rows* + +## open + + `url`="sqlite:data/blog.db" + +**store = > data.db url=`url`** +**fields = > schema** +> `store`.init name=posts fields=`fields` +**existing = > `store`.select table="posts" limit=1** +1. `existing` + *store* +2. * + **seed = > seed** + > `store`.insert table=posts rows=`seed` + *store* diff --git a/examples/marqdo-blog/index.mq.md b/examples/marqdo-blog/index.mq.md index 54d4976..68f8770 100644 --- a/examples/marqdo-blog/index.mq.md +++ b/examples/marqdo-blog/index.mq.md @@ -3,24 +3,13 @@ type: web title: Marqdo 博客 route: / method: GET +data_source: posts +data_order: -created_at description: >- - Document Artifact 示例(ADR 0007):首页即文档。 - 子页/API 见 pages/ 与 api/;入口可 web.serve 扫描注册。 + Document Artifact 首页(ADR 0007):正文即文档,列表来自 data_source。 导入 网页:ext/web/网页.mq.md --- # Marqdo 博客 -可执行文档即网页。本站用 Artifact Metadata 声明路由,正文即内容。 - -## 文章 - -从 `data_source`(元信息)或库表加载列表;本示例入口直接服务文档页。 - ---- - -运行(仓库根目录): - -```text -marqdo run examples/marqdo-blog/serve.mq.md -``` +可执行文档即网页。本站用 Artifact Metadata 声明路由;文章列表由 `data_source: posts` 在服务时加载。 diff --git a/examples/marqdo-blog/pages/post.mq.md b/examples/marqdo-blog/pages/post.mq.md new file mode 100644 index 0000000..4a9cdef --- /dev/null +++ b/examples/marqdo-blog/pages/post.mq.md @@ -0,0 +1,13 @@ +--- +type: web +title: Post +route: /post/{slug} +method: GET +data_source: posts +data_where: slug={slug} +description: Dynamic Document route — body is the article shell; data from Resource. +--- + +# Post + +Article page for `{slug}`. List and detail data are provided by `ext/data` at serve time when `data_source` is set on the Artifact. diff --git a/examples/marqdo-blog/serve.mq.md b/examples/marqdo-blog/serve.mq.md index bebeaa3..3071321 100644 --- a/examples/marqdo-blog/serve.mq.md +++ b/examples/marqdo-blog/serve.mq.md @@ -1,9 +1,11 @@ --- title: marqdo-blog serve -description: Scan Artifact .mq.md under this directory and listen (ADR 0007). -导入 网页:ext/web/网页.mq.md +description: Scan Artifact documents/endpoints and listen (ADR 0007). +import web:ext/web/web.mq.md +import posts:db/posts.mq.md --- # main -> 网页.服务 根="." 主机="127.0.0.1" 端口=18081 +**store = > posts.open url="sqlite:data/blog.db"** +> web.serve root="." host="127.0.0.1" port=18081 db=`store` static_dir="public" diff --git a/examples/marqdo-blog/smoke.sh b/examples/marqdo-blog/smoke.sh index 2f19264..c0bd72e 100755 --- a/examples/marqdo-blog/smoke.sh +++ b/examples/marqdo-blog/smoke.sh @@ -1,71 +1,41 @@ #!/usr/bin/env bash -# 冒烟测试:marqdo-blog 全功能验证。 -# 用法:bash examples/marqdo-blog/smoke.sh +# Artifact blog smoke (ADR 0007). Usage: bash examples/marqdo-blog/smoke.sh +# Expects serve.mq.md already listening on BASE (default 18081). set -uo pipefail -BASE="http://127.0.0.1:18085" +BASE="${BASE:-http://127.0.0.1:18081}" PASS=0; FAIL=0 ok() { echo " ok: $1"; PASS=$((PASS+1)); } bad() { echo " FAIL: $1"; FAIL=$((FAIL+1)); } -echo "== 首页 ==" +echo "== Document home ==" code=$(curl -s -o /dev/null -w "%{http_code}" "$BASE/") [ "$code" = "200" ] && ok "GET / -> $code" || bad "GET / -> $code" curl -s "$BASE/" | grep -q 'Marqdo 博客' && ok "title" || bad "title" -curl -s "$BASE/" | grep -q 'class="card"' && ok "卡片渲染" || bad "卡片缺失" -curl -s "$BASE/" | grep -q 'aside.side' && ok "主题 CSS 注入" || bad "主题 CSS 缺失" -curl -s "$BASE/" | grep -q '@media (max-width: 860px)' && ok "响应式媒体查询" || bad "媒体查询缺失" +curl -s "$BASE/" | grep -q 'class="card"' && ok "data_source cards" || bad "cards missing" +curl -s "$BASE/" | grep -q 'Hello Marqdo' && ok "seed title" || bad "seed title missing" -echo "== 静态 ==" +echo "== Static ==" code=$(curl -s -o /dev/null -w "%{http_code}" "$BASE/static/live.js") [ "$code" = "200" ] && ok "GET /static/live.js -> $code" || bad "static -> $code" -code=$(curl -s -o /dev/null -w "%{http_code}" "$BASE/favicon.ico") -[ "$code" = "200" ] && ok "GET /favicon.ico -> $code" || bad "favicon -> $code" -curl -s "$BASE/" | grep -q 'rel="icon"' && ok "head icon link" || bad "head icon 缺失" -curl -s "$BASE/" | grep -q 'mq-images' && ok "图片装配 logo" || bad "mq-images 缺失" -echo "== 动态路由 ==" -code=$(curl -s -o /dev/null -w "%{http_code}" "$BASE/post/hello-marqdo") -[ "$code" = "200" ] && ok "GET /post/hello-marqdo -> $code" || bad "post detail -> $code" -curl -s "$BASE/post/hello-marqdo" | grep -q 'article-title' && ok "文章详情渲染" || bad "文章详情缺失" +echo "== Dynamic Document ==" +code=$(curl -s -o /dev/null -w "%{http_code}" "$BASE/post/hello") +[ "$code" = "200" ] && ok "GET /post/hello -> $code" || bad "post detail -> $code" +curl -s "$BASE/post/hello" | grep -q 'article-title' && ok "article title" || bad "article title missing" -echo "== 标签 ==" -curl -s "$BASE/tags" | grep -q 'href="/tag/marqdo"' && ok "标签归档链接" || bad "标签链接缺失" -code=$(curl -s -o /dev/null -w "%{http_code}" "$BASE/tag/web") -[ "$code" = "200" ] && ok "GET /tag/web -> $code" || bad "tag page -> $code" +echo "== ZH Document ==" +code=$(curl -s -o /dev/null -w "%{http_code}" "$BASE/about") +[ "$code" = "200" ] && ok "GET /about -> $code" || bad "about -> $code" +curl -s "$BASE/about" | grep -q '关于 Marqdo' && ok "about body" || bad "about body missing" -echo "== 鉴权门禁 ==" -code=$(curl -s -o /dev/null -w "%{http_code}" "$BASE/admin") -[ "$code" = "303" ] && ok "未登录 /admin -> $code (重定向登录)" || bad "未登录 /admin -> $code" - -echo "== 登录 ==" -rm -f /tmp/mq_smoke_cookies.txt /tmp/mq_smoke_headers.txt -curl -s -D /tmp/mq_smoke_headers.txt -o /dev/null -d "username=admin&password=marqdo" "$BASE/admin/login" -sid=$(grep -i "set-cookie" /tmp/mq_smoke_headers.txt | sed 's/.*marqdo_sid=\([^;]*\).*/\1/') -[ -n "$sid" ] && ok "登录获取会话 cookie" || bad "登录未返回 cookie" -code=$(curl -s -b "marqdo_sid=$sid" -o /dev/null -w "%{http_code}" "$BASE/admin") -[ "$code" = "200" ] && ok "带会话访问 /admin -> $code" || bad "带会话 /admin -> $code" - -echo "== 发布文章 (CRUD) ==" -code=$(curl -s -b "marqdo_sid=$sid" -o /dev/null -w "%{http_code}" "$BASE/admin/posts/new") -[ "$code" = "200" ] && ok "GET /admin/posts/new -> $code" || bad "new form -> $code" - -echo "== WebSocket ==" -wsok=$(python3 -c " -import socket, base64, os -s = socket.create_connection(('127.0.0.1', 18085), timeout=3) -key = base64.b64encode(os.urandom(16)).decode() -s.sendall((f'GET /live HTTP/1.1\r\nHost: x\r\nUpgrade: websocket\r\nConnection: Upgrade\r\nSec-WebSocket-Key: {key}\r\nSec-WebSocket-Version: 13\r\n\r\n').encode()) -r = s.recv(1024).decode(errors='replace') -if '101' not in r.split('\r\n')[0]: - print('NO'); s.close(); raise SystemExit -mask = os.urandom(4); payload = b'ping' -m = bytes(b ^ mask[i%4] for i, b in enumerate(payload)) -s.sendall(bytes([0x81, 0x80|len(payload)]) + mask + m) -d = s.recv(1024) -print('OK' if b'ping' in d else 'NO') -s.close() -" 2>/dev/null) -[ "$wsok" = "OK" ] && ok "WebSocket /live 回显" || bad "WebSocket 回显 $wsok" +echo "== Endpoint ==" +code=$(curl -s -o /dev/null -w "%{http_code}" "$BASE/api/ping") +[ "$code" = "200" ] && ok "GET /api/ping -> $code" || bad "ping -> $code" +curl -s "$BASE/api/ping" | grep -q 'marqdo-blog' && ok "ping json" || bad "ping json missing" +code=$(curl -s -o /tmp/mq_blog_echo.json -w "%{http_code}" \ + -H 'Content-Type: application/json' -d '{"message":"hi"}' "$BASE/api/echo") +[ "$code" = "200" ] && ok "POST /api/echo -> $code" || bad "echo -> $code" +grep -q '"message":"hi"' /tmp/mq_blog_echo.json && ok "echo body" || bad "echo body missing" echo echo "通过 $PASS / $((PASS+FAIL))" diff --git a/plugins/web/abi_artifact.go b/plugins/web/abi_artifact.go index 3fce157..59bd252 100644 --- a/plugins/web/abi_artifact.go +++ b/plugins/web/abi_artifact.go @@ -19,6 +19,7 @@ import ( "os" "path/filepath" "strconv" + "strings" "github.com/marqdo/marqdo/plugins/web/internal/app" "github.com/marqdo/marqdo/plugins/web/internal/artifact" @@ -123,6 +124,7 @@ func web_serve_root(argsJSON *C.char, outJSON **C.char, errMsg **C.char) C.int { } } homeArgs := map[string]any{"title": "Marqdo"} + var homeMeta map[string]string for _, f := range files { if f.Kind == "web" && (f.Route == "/" || f.Rel == "index.mq.md") { title := f.Meta["title"] @@ -136,33 +138,72 @@ func web_serve_root(argsJSON *C.char, outJSON **C.char, errMsg **C.char) C.int { "title": title, "intro": artifact.MarkdownHTML(f.Body), } + homeMeta = f.Meta break } } home := page.New(homeArgs) + stampArtifactData(home, homeMeta) a := app.New(map[string]any{ "page": home, "db": args["db"], "host": host, "port": port, }) + artifactRoutes := map[string]any{} for _, f := range files { - if f.Kind != "web" || f.Route == "/" { + if f.Kind == "web" { + if f.Route == "/" { + continue + } + title := f.Meta["title"] + if title == "" { + title = f.Meta["标题"] + } + pg := page.New(map[string]any{ + "title": title, + "intro": artifact.MarkdownHTML(f.Body), + }) + stampArtifactData(pg, f.Meta) + out, err := app.Route(a, f.Route, pg) + if err != nil { + return replyJSON(outJSON, errMsg, nil, err) + } + a = out continue } - title := f.Meta["title"] - if title == "" { - title = f.Meta["标题"] + // endpoint + req := f.Meta["request"] + if req == "" { + req = f.Meta["请求"] } - pg := page.New(map[string]any{ - "title": title, - "intro": artifact.MarkdownHTML(f.Body), - }) - out, err := app.Route(a, f.Route, pg) - if err != nil { - return replyJSON(outJSON, errMsg, nil, err) + if req == "" { + req = "json" } - a = out + resp := f.Meta["response"] + if resp == "" { + resp = f.Meta["响应"] + } + if resp == "" { + resp = "json" + } + auth := f.Meta["auth"] + if auth == "" { + auth = f.Meta["鉴权"] + } + key := f.Method + " " + f.Route + artifactRoutes[key] = map[string]any{ + "method": f.Method, + "path": f.Route, + "file": f.Path, + "request": req, + "response": resp, + "auth": auth, + "kind": "endpoint", + } + } + if len(artifactRoutes) > 0 { + a["artifact_routes"] = artifactRoutes } if mw := args["middleware"]; mw != nil { out, err := middleware.Configure(a, map[string]any{"security": mw}) @@ -222,3 +263,64 @@ func web_route_use(argsJSON *C.char, outJSON **C.char, errMsg **C.char) C.int { rt["middleware"] = args["middleware"] return replyJSON(outJSON, errMsg, rt, nil) } + +// stampArtifactData applies flat Document metadata (ADR 0007) onto a page bag. +func stampArtifactData(pg map[string]any, meta map[string]string) { + if pg == nil || meta == nil { + return + } + src := meta["data_source"] + if src == "" { + src = meta["数据源"] + } + if src != "" { + pg["data_source"] = src + } + order := meta["data_order"] + if order == "" { + order = meta["排序"] + } + if order != "" { + pg["order"] = order + } + where := meta["data_where"] + if where == "" { + where = meta["条件"] + } + if where != "" { + // col=val,col2=val2 → query map (values may contain {param}) + q := map[string]any{} + for _, part := range strings.Split(where, ",") { + part = strings.TrimSpace(part) + if part == "" { + continue + } + k, v, ok := strings.Cut(part, "=") + if !ok { + continue + } + q[strings.TrimSpace(k)] = strings.TrimSpace(v) + } + if len(q) > 0 { + pg["query"] = q + // Filtered Document routes render as article detail (007 /post/{slug}). + pg["detail"] = true + } + } + if d := meta["detail"]; d != "" { + pg["detail"] = d == "true" || d == "True" || d == "1" + } + if d := meta["详情"]; d != "" { + pg["detail"] = d == "true" || d == "True" || d == "1" || d == "是" + } + prefix := meta["link_prefix"] + if prefix == "" { + prefix = meta["链接前缀"] + } + if prefix != "" { + pg["link_prefix"] = prefix + } else if src != "" && where == "" { + // List pages default card links to /post/{slug}. + pg["link_prefix"] = "/post/" + } +} diff --git a/plugins/web/internal/artifact/artifact.go b/plugins/web/internal/artifact/artifact.go index da73b70..2debb6e 100644 --- a/plugins/web/internal/artifact/artifact.go +++ b/plugins/web/internal/artifact/artifact.go @@ -279,6 +279,17 @@ func InspectBag(app map[string]any, declared []ArtifactFile) map[string]any { dec = append(dec, map[string]any{"path": key, "kind": "endpoint"}) } } + if art, ok := app["artifact_routes"].(map[string]any); ok { + for key, v := range art { + m, _ := v.(map[string]any) + dec = append(dec, map[string]any{ + "path": key, + "kind": "endpoint", + "method": fmt.Sprint(m["method"]), + "file": fmt.Sprint(m["file"]), + }) + } + } } return map[string]any{ "declared": dec, diff --git a/plugins/web/internal/httpx/listen.go b/plugins/web/internal/httpx/listen.go index 6925d68..d348f40 100644 --- a/plugins/web/internal/httpx/listen.go +++ b/plugins/web/internal/httpx/listen.go @@ -122,6 +122,7 @@ func NewHandler(appBag map[string]any, entryDir string) (http.Handler, error) { galleryRoutes: routeMapOf(appBag, "gallery_routes"), proxyRoutes: routeMapOf(appBag, "proxy_routes"), invokeRoutes: routeMapOf(appBag, "invoke_routes"), + artifactRoutes: routeMapOf(appBag, "artifact_routes"), auth: authCfg, oidc: oidc.ParseConfig(appBag), tenant: tenant.FromBag(appBag), @@ -238,6 +239,7 @@ func NewHandler(appBag map[string]any, entryDir string) (http.Handler, error) { st.mountGalleryRoutes(mux) st.mountProxyRoutes(mux) st.mountInvokeRoutes(mux) + st.mountArtifactRoutes(mux) st.mountAuthRoutes(mux) mux.HandleFunc("/{path...}", st.handleNotFound) @@ -307,6 +309,7 @@ type state struct { galleryRoutes map[string]any proxyRoutes map[string]any invokeRoutes map[string]any + artifactRoutes map[string]any auth authConfig oidc oidc.Config tenant tenant.Config diff --git a/plugins/web/internal/httpx/routes_artifact.go b/plugins/web/internal/httpx/routes_artifact.go new file mode 100644 index 0000000..c2babb6 --- /dev/null +++ b/plugins/web/internal/httpx/routes_artifact.go @@ -0,0 +1,142 @@ +package httpx + +import ( + "encoding/json" + "fmt" + "io" + "net/http" + "strings" + + "github.com/marqdo/marqdo/plugins/web/internal/plugin" + "github.com/marqdo/marqdo/plugins/web/internal/session" +) + +// artifactRoute is one Endpoint file registered by web.serve (ADR 0007). +type artifactRoute struct { + Method string + Path string + File string + Request string // json | form | none | query + Response string // json | text | html + Auth string // role name or "" / "none" +} + +func parseArtifactRoute(v any) artifactRoute { + m, _ := v.(map[string]any) + return artifactRoute{ + Method: strings.ToUpper(strOpt(m, "method", "GET")), + Path: strOpt(m, "path", ""), + File: strOpt(m, "file", ""), + Request: strings.ToLower(strOpt(m, "request", "json")), + Response: strings.ToLower(strOpt(m, "response", "json")), + Auth: strOpt(m, "auth", ""), + } +} + +func (st *state) mountArtifactRoutes(mux *http.ServeMux) { + for _, key := range sortedKeys(st.artifactRoutes) { + cfg := parseArtifactRoute(st.artifactRoutes[key]) + if cfg.File == "" || cfg.Path == "" { + continue + } + method := cfg.Method + if method == "" { + method = http.MethodGet + } + pattern := method + " " + goMuxPattern(cfg.Path) + routeCfg := cfg + mux.HandleFunc(pattern, func(w http.ResponseWriter, r *http.Request) { + if r.Method != method { + http.Error(w, "method not allowed", http.StatusMethodNotAllowed) + return + } + st.handleArtifact(w, r, routeCfg) + }) + } +} + +func (st *state) handleArtifact(w http.ResponseWriter, r *http.Request, route artifactRoute) { + if route.Auth != "" && !strings.EqualFold(route.Auth, "none") { + cookie := r.Header.Get("Cookie") + user := session.UsernameFromCookie(cookie) + if user == "" { + jsonErr(w, http.StatusUnauthorized, "auth required") + return + } + role := session.RoleFromCookie(cookie) + if role != "" && role != route.Auth && role != "admin" && role != "superadmin" { + jsonErr(w, http.StatusForbidden, "forbidden") + return + } + } + + payload := map[string]any{} + switch route.Request { + case "none": + payload = queryToMap(r.URL.RawQuery) + case "query": + payload = queryToMap(r.URL.RawQuery) + case "form": + body, err := io.ReadAll(http.MaxBytesReader(w, r.Body, 8<<20)) + if err != nil { + jsonErr(w, http.StatusBadRequest, fmt.Sprintf("body: %v", err)) + return + } + payload = formToMap(body) + default: // json + body, err := io.ReadAll(http.MaxBytesReader(w, r.Body, 8<<20)) + if err != nil { + jsonErr(w, http.StatusBadRequest, fmt.Sprintf("body: %v", err)) + return + } + q := queryToMap(r.URL.RawQuery) + if len(body) == 0 { + payload = q + } else { + var raw map[string]any + if err := json.Unmarshal(body, &raw); err != nil { + jsonErr(w, http.StatusBadRequest, fmt.Sprintf("json: %v", err)) + return + } + if raw == nil { + payload = q + } else { + for k, v := range q { + if _, exists := raw[k]; !exists { + raw[k] = v + } + } + payload = raw + } + } + } + for _, name := range pathParamNames(route.Path) { + if v := r.PathValue(name); v != "" { + payload[name] = v + } + } + + value, err := plugin.RunArtifact(route.File, payload) + if err != nil { + jsonErr(w, http.StatusInternalServerError, err.Error()) + return + } + + switch route.Response { + case "text": + w.Header().Set("Content-Type", "text/plain; charset=utf-8") + w.WriteHeader(http.StatusOK) + _, _ = io.WriteString(w, fmt.Sprint(value)) + case "html", "text/html": + w.Header().Set("Content-Type", "text/html; charset=utf-8") + w.WriteHeader(http.StatusOK) + _, _ = io.WriteString(w, fmt.Sprint(value)) + default: + code, body, err := jsonWrapInvokeValue(value) + if err != nil { + jsonErr(w, code, err.Error()) + return + } + writeJSON(w, code, body) + } +} diff --git a/plugins/web/internal/plugin/host.go b/plugins/web/internal/plugin/host.go index 764dda9..67ae69f 100644 --- a/plugins/web/internal/plugin/host.go +++ b/plugins/web/internal/plugin/host.go @@ -49,3 +49,25 @@ func CallLibPath(path string, args map[string]any) (any, error) { } return v, nil } + +// RunArtifact loads and runs a Document/Endpoint `.mq.md` (ADR 0007). +// Request fields are passed as Metadata Binding overlays (`arg` / `--bind`). +func RunArtifact(path string, args map[string]any) (any, error) { + payload := map[string]any{"path": path} + if len(args) > 0 { + payload["args"] = args + } + raw, err := json.Marshal(payload) + if err != nil { + return nil, err + } + out, err := Query("run_artifact", string(raw)) + if err != nil { + return nil, err + } + var v any + if err := json.Unmarshal([]byte(out), &v); err != nil { + return nil, err + } + return v, nil +} diff --git a/plugins/web/internal/render/artifact_data_test.go b/plugins/web/internal/render/artifact_data_test.go new file mode 100644 index 0000000..62d71b1 --- /dev/null +++ b/plugins/web/internal/render/artifact_data_test.go @@ -0,0 +1,88 @@ +package render + +import ( + "os" + "path/filepath" + "strings" + "testing" + + "github.com/marqdo/marqdo/plugins/web/internal/db" +) + +func TestResolveMainDataSource(t *testing.T) { + dir := t.TempDir() + url := "sqlite:" + filepath.Join(dir, "t.db") + fields := []any{ + map[string]any{"字段": "title", "类型": "text", "可空": false}, + map[string]any{"字段": "slug", "类型": "text", "可空": false}, + map[string]any{"字段": "summary", "类型": "text", "可空": true}, + map[string]any{"字段": "content", "类型": "text", "可空": true}, + } + if _, err := db.Init(url, "posts", fields); err != nil { + t.Fatal(err) + } + rows := []any{ + map[string]any{ + "title": "Hello", "slug": "hello", + "summary": "sum", "content": "# Body", + }, + } + if _, err := db.Insert(url, "posts", rows); err != nil { + t.Fatal(err) + } + page := map[string]any{ + "intro": "

hi

", + "data_source": "posts", + "order": "-id", + "link_prefix": "/post/", + } + intro, items, _ := resolveMain(page, url) + if intro != "

hi

" { + t.Fatalf("intro=%q", intro) + } + if len(items) != 1 { + t.Fatalf("items=%d", len(items)) + } + if items[0]["title"] != "Hello" || items[0]["href"] != "hello" { + t.Fatalf("item=%v", items[0]) + } + html := RenderPage(page, url, "") + if !strings.Contains(html, `class="card"`) || !strings.Contains(html, "Hello") { + t.Fatalf("html missing card: %s", html[:min(400, len(html))]) + } + _ = os.RemoveAll(dir) +} + +func TestResolveMainDataWhereDetail(t *testing.T) { + dir := t.TempDir() + url := "sqlite:" + filepath.Join(dir, "t.db") + fields := []any{ + map[string]any{"字段": "title", "类型": "text", "可空": false}, + map[string]any{"字段": "slug", "类型": "text", "可空": false}, + map[string]any{"字段": "content", "类型": "text", "可空": true}, + } + if _, err := db.Init(url, "posts", fields); err != nil { + t.Fatal(err) + } + rows := []any{ + map[string]any{"title": "A", "slug": "a", "content": "alpha"}, + map[string]any{"title": "B", "slug": "b", "content": "beta"}, + } + if _, err := db.Insert(url, "posts", rows); err != nil { + t.Fatal(err) + } + page := map[string]any{ + "data_source": "posts", + "query": map[string]any{"slug": "{slug}"}, + "params": map[string]any{"slug": "b"}, + "detail": true, + } + _, items, _ := resolveMain(page, url) + if len(items) != 1 || items[0]["title"] != "B" { + t.Fatalf("items=%v", items) + } + html := RenderPage(page, url, "") + if !strings.Contains(html, "article-title") || !strings.Contains(html, "B") { + t.Fatalf("detail html: %s", html[:min(500, len(html))]) + } +} diff --git a/plugins/web/internal/render/render.go b/plugins/web/internal/render/render.go index 29898c8..84ba174 100644 --- a/plugins/web/internal/render/render.go +++ b/plugins/web/internal/render/render.go @@ -420,22 +420,6 @@ func renderULWithMQ(links []navLink, class string, mqPairs [][2]string) string { func resolveMain(page map[string]any, dbURL string) (intro string, items []map[string]any, total *int64) { intro, _ = page["intro"].(string) - main, ok := page["main"] - if !ok { - return intro, nil, nil - } - bindsAny := table.AsBind(main) - arr, _ := bindsAny.([]any) - if len(arr) == 0 { - return intro, nil, nil - } - if dbURL == "" { - return intro, nil, nil - } - tn, ok := table.BindTableName(arr) - if !ok { - return intro, nil, nil - } limit := int64(200) offset := int64(0) if p, ok := page["paginate"].(map[string]any); ok { @@ -446,22 +430,90 @@ func resolveMain(page map[string]any, dbURL string) (intro string, items []map[s offset = int64(v) } } - data := selectPageData(dbURL, tn, page, limit, offset) + + // Legacy compose_main bind table (internal); prefer when present. + if main, ok := page["main"]; ok { + bindsAny := table.AsBind(main) + arr, _ := bindsAny.([]any) + if len(arr) > 0 && dbURL != "" { + if tn, ok := table.BindTableName(arr); ok { + data := selectPageData(dbURL, tn, page, limit, offset) + if t, ok := data["total"].(float64); ok { + ti := int64(t) + total = &ti + } + rawRows, _ := data["rows"].([]any) + projected := table.ProjectRows(arr, rawRows) + parr, _ := projected.([]any) + for _, v := range parr { + if m, ok := v.(map[string]any); ok { + items = append(items, m) + } + } + return intro, items, total + } + } + } + + // Artifact Document: flat data_source / data_order / data_where (ADR 0007). + src, _ := page["data_source"].(string) + if src == "" || dbURL == "" { + return intro, nil, nil + } + data := selectPageData(dbURL, src, page, limit, offset) if t, ok := data["total"].(float64); ok { ti := int64(t) total = &ti } rawRows, _ := data["rows"].([]any) - projected := table.ProjectRows(arr, rawRows) - parr, _ := projected.([]any) - for _, v := range parr { - if m, ok := v.(map[string]any); ok { + for _, v := range rawRows { + if m := projectArtifactRow(v); m != nil { items = append(items, m) } } return intro, items, total } +// projectArtifactRow maps a DB row to card/article fields without compose binds. +func projectArtifactRow(row any) map[string]any { + obj, ok := row.(map[string]any) + if !ok || obj == nil { + return nil + } + m := map[string]any{} + if id, ok := obj["id"]; ok { + m["id"] = id + } + if t := text(obj["title"]); t != "" { + m["title"] = t + } + if s := text(obj["slug"]); s != "" { + m["href"] = s + } else if h := text(obj["href"]); h != "" { + m["href"] = h + } + // Detail pages prefer full content; list cards prefer summary. + if c := text(obj["content"]); c != "" { + m["body"] = c + } else if s := text(obj["summary"]); s != "" { + m["body"] = s + } else if b := text(obj["body"]); b != "" { + m["body"] = b + } + if tag := text(obj["tag"]); tag != "" { + m["tag"] = tag + } + if meta := text(obj["created_at"]); meta != "" { + m["meta"] = meta + } else if meta := text(obj["meta"]); meta != "" { + m["meta"] = meta + } + if len(m) == 0 { + return nil + } + return m +} + // listBind is one secondary page list (compose_list / 列表装配). type listBind struct { Items []map[string]any diff --git a/plugins/web/plugin.go b/plugins/web/plugin.go index 3493ba9..b79cfc4 100644 --- a/plugins/web/plugin.go +++ b/plugins/web/plugin.go @@ -176,16 +176,6 @@ static int register_core(void) { if (host_register((char *)"web_page_detail", (char *)"page,detail", web_page_detail) != 0) return 1; if (host_register((char *)"web_page_chrome", (char *)"page,nav_html,footer_html,body_class", web_page_chrome) != 0) return 1; if (host_register((char *)"web_style", (char *)"name,table,strict", web_style) != 0) return 1; - if (host_register((char *)"web_compose_components", (char *)"page,components", web_compose_components) != 0) return 1; - if (host_register((char *)"web_compose_main", (char *)"page,main", web_compose_main) != 0) return 1; - if (host_register((char *)"web_compose_list", (char *)"page,main,query,order,target", web_compose_list) != 0) return 1; - if (host_register((char *)"web_compose_intro", (char *)"page,intro", web_compose_intro) != 0) return 1; - if (host_register((char *)"web_intro", (char *)"table", web_intro) != 0) return 1; - if (host_register((char *)"web_compose_form", (char *)"page,form,id,target", web_compose_form) != 0) return 1; - if (host_register((char *)"web_compose_auth_form", (char *)"page,action,submit,form_id,err_id,target,next,kind", web_compose_auth_form) != 0) return 1; - if (host_register((char *)"web_compose_nav_brand", (char *)"page,title,href,logo,logo_light,theme_key", web_compose_nav_brand) != 0) return 1; - if (host_register((char *)"web_compose_client", (char *)"page,source,bridge,wasm", web_compose_client) != 0) return 1; - if (host_register((char *)"web_compose_form_load", (char *)"page,table,id_param", web_compose_form_load) != 0) return 1; if (host_register((char *)"web_render", (char *)"page", web_render) != 0) return 1; if (host_register((char *)"web_db_new", (char *)"url", web_db_new) != 0) return 1; if (host_register((char *)"web_db_init", (char *)"url,name,fields", web_db_init) != 0) return 1; diff --git a/skills/marqdo/SKILL.md b/skills/marqdo/SKILL.md index cff7679..46bb69e 100644 --- a/skills/marqdo/SKILL.md +++ b/skills/marqdo/SKILL.md @@ -221,7 +221,7 @@ Design: [ext-quantum.md](../../doc/design/ext-quantum.md) · Q7: [ext-quantum-q7 | Import `lib/text` then call bare `split` | `> text.split …` (qualified) | | Import `lib/text` then call `拆分` | Match file language (`text.split`, not 文本) | | `json.set` / `json.append` to build maps or lists | GFM tables; sparse `table.put`; named helpers (`browser.*`, `web.*`) | -| `json.set` / `compose_*` page parts | `type: web` Document + View table / `web.render` | +| `json.set` / `compose_*` page parts | `type: web` Document + View table / `web.render` / `web.serve` | | Import `json` for every browser handler | `import browser:lib/browser.mq.md` + tables ([marqdo-dev](../marqdo-dev/SKILL.md)) | | Mix `web.page` and `网页.页面` in one file | One import language per `.mq.md` | | Call `host_web_*` from `ext/web` | Use `# app` / `# db` methods; plugin ABI only | diff --git a/skills/marqdo/examples.md b/skills/marqdo/examples.md index 1940e0c..efbfc6d 100644 --- a/skills/marqdo/examples.md +++ b/skills/marqdo/examples.md @@ -259,44 +259,38 @@ if x > 0: > print text=y-other ``` -## 13. Dynamic site (ext/web, minimal) +## 13. Dynamic site (Web Artifact, minimal) + +`index.mq.md`: + +```markdown +--- +type: web +title: Hello +route: / +method: GET +--- + +# Hello + +Executable document as a page. +``` + +`serve.mq.md`: ```markdown --- -title: hello-site import web:ext/web/web.mq.md -import db:db/index.mq.md --- # main -`shell` = - -| 组件 | 样式 | -|------|------| -| nav | | - -`main` = - -| 属性 | 值 | 样式 | -|------|-----|------| -| title | posts.title | | -| body | posts.summary | | - -*store = > db.open* -*css = "body{font-family:sans-serif}"* -*page = > web.page title="Hello"* -*page = > page.compose_components components=`shell`* -*page = > page.compose_main main=`main`* -*page = > page.css css=`css`* -*app = > web.app page=`page` port=8080* -*app = > app.static prefix="/static" dir="static"* -> listen app=`app` +> web.serve root="." host="127.0.0.1" port=8080 ``` -- Import `ext/web/web.mq.md` **or** `ext/web/网页.mq.md` — not both; match API language to the file. -- Full blog/CMS patterns: `examples/marqdo-blog/` (routes, SEO, RSS, auth, upload, WS). -- Run after `marqdo ext add web` and building `marqdo_plugin_web`. +- Import `ext/web/web.mq.md` **or** `ext/web/网页.mq.md` — not both. +- Full Artifact blog: `examples/marqdo-blog/` (`pages/` · `api/` · `db/` · `data_source`). +- Design: `doc/design/ext-web-artifact.md` · ADR 0007. No `compose_*` / `configure`. ## 14. Quantum entanglement lab (ext/quantum Q7/Q8) diff --git a/skills/marqdo/reference.md b/skills/marqdo/reference.md index 63952a7..65074ce 100644 --- a/skills/marqdo/reference.md +++ b/skills/marqdo/reference.md @@ -60,24 +60,24 @@ Import one file; use **that** file’s function names. Open the imported `.mq.md` under `lib/` or `ext/` to see exact `##` / `#` names and parameters. Gold tests: `tests/lib/`, `tests/structure/`, `tests/ext/`. -## ext/web (dynamic sites) +## ext/web (Artifact sites · ADR 0007) -Install: `marqdo ext add web` (`网页`). Native: `cargo build --release -p marqdo_plugin_web`. +Install: `marqdo ext add web` (`网页`). Native: `bash scripts/build-web-plugin.sh`. -| EN import | ZH import | Core types | -|-----------|-----------|------------| -| `ext/web/web.mq.md` | `ext/web/网页.mq.md` | `# page` `# style` `# db` `# form` `# app` `# auth` `# cache` `# storage` | +| EN import | ZH import | Surface | +|-----------|-----------|---------| +| `ext/web/web.mq.md` | `ext/web/网页.mq.md` | facade: `page` · `route` · `serve` · `render` · `inspect` · `use` | -| Area | EN methods (representative) | Notes | -|------|----------------------------|-------| -| Page | `compose_components`, `compose_main`, `render`, `meta`, `paginate` | GFM tables; cells are literal path strings | -| DB | `init`, `insert`, `select`, `paginate`, `get`, `update`, `delete`, `migrate`, `fts`, `search`, `count`, `事务`/`txn` | init supports `unique`/`index`/`fk`; auto `created_at`/`updated_at` | -| App | `route`, `static`, `configure`, `listen`, `auth`, `gate`, `upload`, `download`, `gallery`, `route_rss`, `redirect`, `error_page`, `sitemap`, `robots` | W0–W7 + P3 complete | -| Auth | `login`, `check`, `logout`, `hash_password` | argon2 + CSRF + SQLite sessions; `role` for RBAC | +| Kind | Metadata | Notes | +|------|----------|-------| +| Document | `type: web` / `类型: 网页` | `route` · `data_source` · `data_order` · `data_where` | +| Endpoint | `type: endpoint` / `类型: 端点` | `path` · `method` · `# main` handler · `request`/`response` | +| View | `|type|slot|value|attrs|style|` | `web.render nodes=` | +| Resource | `ext/data` · `ext/security` · `ext/net` | db/cache/storage · auth/rbac/oidc · websocket | -Drivers (Postgres / Redis / S3): `db url=postgres://…`, `cache url=memory:`, `storage url=file:…` — see `doc/design/ext-web-drivers.md`. +Do **not** use `compose_*` / `app.configure` / author `ensure_plugin`. -Example project: `examples/marqdo-blog/`. Capability matrix: `doc/design/web-net-capabilities.md`. +Example: `examples/marqdo-blog/`. Design: `doc/design/ext-web-artifact.md`. Historical matrix: `doc/design/web-net-capabilities.md`. ## ext/quantum (circuits + Q7/Q8) diff --git a/src/host/plugin.rs b/src/host/plugin.rs index 84d4aef..941523c 100644 --- a/src/host/plugin.rs +++ b/src/host/plugin.rs @@ -417,6 +417,44 @@ unsafe extern "C" fn host_query( }); Ok(serde_json::json!({ "ok": true })) })(), + // ADR 0007: run a Document/Endpoint `.mq.md` for HTTP handlers. + "run_artifact" => (|| { + 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!("run_artifact args: {e}"))?; + let path = args + .get("path") + .and_then(|v| v.as_str()) + .ok_or_else(|| "run_artifact requires `path`".to_string())?; + let p = std::path::PathBuf::from(path); + if !p.is_file() { + return Err(format!("run_artifact: not a file: {path}")); + } + let mut binds: Vec<(String, String)> = Vec::new(); + if let Some(obj) = args.get("args").and_then(|v| v.as_object()) { + for (k, v) in obj { + let s = match v { + serde_json::Value::String(t) => t.clone(), + serde_json::Value::Null => continue, + other => other.to_string(), + }; + binds.push((k.clone(), s)); + } + } + let opts = crate::RunOptions { + binds, + allow_fs_write: ctx.caps.fs_write, + allow_exec: ctx.caps.exec, + allow_net: ctx.caps.net, + ..crate::RunOptions::default() + }; + let cap = crate::run_file_capture(&p, &opts).map_err(|e| e.to_string())?; + value_to_json(&cap.value) + })(), other => Err(format!("host_query: unknown `{other}`")), }; diff --git a/tests/ext/web-admin-smoke.mq.md b/tests/ext/web-admin-smoke.mq.md deleted file mode 100644 index 52a0e77..0000000 --- a/tests/ext/web-admin-smoke.mq.md +++ /dev/null @@ -1,93 +0,0 @@ ---- -title: web admin form-from-schema smoke -description: Schema-derived admin forms share validate/submit (offline). -import web:ext/web/web.mq.md -import articles:web-fixtures/db/articles.mq.md -import json:lib/json.mq.md ---- - -# main - -**store = > web.db url="sqlite:web-fixtures/data/admin-smoke.db"** -**schema = > articles.schema** -> `store`.init name=articles fields=`schema` -> `store`.exec sql="DELETE FROM articles" -> `store`.exec sql="DELETE FROM sqlite_sequence WHERE name='articles'" -**url = > json.get value=`store` key="url"** - -**info = > web_db_table_info url=`url` table="articles"** -**cols = > json.get value=`info` key="columns"** -**n = > len value=`cols`** -1. `n` >= 2 - > print text=schema-ok -2. * - > print text=schema-fail - -**fnew = > web_form_from_schema url=`url` table="articles" action="insert"** -**fields = > json.get value=`fnew` key="fields"** -**nf = > len value=`fields`** -1. `nf` >= 1 - > print text=new-form-ok -2. * - > print text=new-form-fail - -`row` = - -| title | body | -|-------|------| -| Admin create | via schema form | - -**sub = > web_form_submit form=`fnew` data=`row` url=`url`** -**sok = > json.get value=`sub` key="ok"** -1. `sok` - > print text=insert-ok -2. * - > print text=insert-fail - -**got = > `store`.get table="articles" id=1** -**title = > json.get value=`got` key="title"** -1. `title` == "Admin create" - > print text=get-ok -2. * - > print text=get-fail - -**fedit = > web_form_from_schema url=`url` table="articles" action="update" id=1** -`patch` = - -| title | body | -|-------|------| -| Admin edited | body updated | - -**up = > web_form_submit form=`fedit` data=`patch` url=`url`** -**uok = > json.get value=`up` key="ok"** -1. `uok` - > print text=update-ok -2. * - > print text=update-fail - -**got2 = > `store`.get table="articles" id=1** -**title2 = > json.get value=`got2` key="title"** -1. `title2` == "Admin edited" - > print text=edit-ok -2. * - > print text=edit-fail - -`empty` = - -| title | body | -|-------|------| -| | | - -**bad = > web_form_submit form=`fnew` data=`empty` url=`url`** -**bok = > json.get value=`bad` key="ok"** -1. `bok` - > print text=required-should-fail -2. * - > print text=required-ok - -**errs = > json.get value=`bad` key="errors"** -**nerr = > len value=`errs`** -1. `nerr` >= 1 - > print text=errors-echoed-ok -2. * - > print text=errors-echoed-fail diff --git a/tests/ext/web-artifact-site/api/ping.mq.md b/tests/ext/web-artifact-site/api/ping.mq.md new file mode 100644 index 0000000..3f3bba1 --- /dev/null +++ b/tests/ext/web-artifact-site/api/ping.mq.md @@ -0,0 +1,18 @@ +--- +type: endpoint +method: GET +path: /api/ping +request: none +response: json +auth: none +--- + +# main + +`out` = + +| ok | ping | +|----|------| +| True | pong | + +*out* diff --git a/tests/ext/web-artifact-site/index.mq.md b/tests/ext/web-artifact-site/index.mq.md new file mode 100644 index 0000000..b70cc45 --- /dev/null +++ b/tests/ext/web-artifact-site/index.mq.md @@ -0,0 +1,10 @@ +--- +type: web +title: Artifact site +route: / +method: GET +--- + +# Artifact site + +Home Document for live Endpoint tests. diff --git a/tests/ext/web-artifact-site/pages/about.mq.md b/tests/ext/web-artifact-site/pages/about.mq.md new file mode 100644 index 0000000..e6fb065 --- /dev/null +++ b/tests/ext/web-artifact-site/pages/about.mq.md @@ -0,0 +1,10 @@ +--- +type: web +title: About +route: /about +method: GET +--- + +# About + +Declared Document route. diff --git a/tests/ext/web-artifact-site/serve.mq.md b/tests/ext/web-artifact-site/serve.mq.md new file mode 100644 index 0000000..37b3fa3 --- /dev/null +++ b/tests/ext/web-artifact-site/serve.mq.md @@ -0,0 +1,8 @@ +--- +title: artifact site serve +import web:ext/web/web.mq.md +--- + +# main + +> web.serve root="." host="127.0.0.1" port=18110 diff --git a/tests/ext/web-assets-live-server.mq.md b/tests/ext/web-assets-live-server.mq.md deleted file mode 100644 index 0656e09..0000000 --- a/tests/ext/web-assets-live-server.mq.md +++ /dev/null @@ -1,36 +0,0 @@ ---- -title: web assets live server -description: Live favicon + head icon + images_html on home page. -import web:ext/web/web.mq.md ---- - -# main - -`icons_table` = - -|path|rel|type|url| -|---|---|---|---| -|"web-fixtures/public/favicon.png"|icon|"image/png"|"/favicon.ico"| - -`head_table` = - -|rel|href|type| -|---|---|---| -|apple-touch-icon|"/static/favicon.png"|"image/png"| - -`images_table` = - -|src|alt|class|loading| -|---|---|---|---| -|"/static/favicon.svg"|mark|brand|eager| - -**home = > web.page title="Live assets" intro="

assets live

"** -**home = > `home`.head table=`head_table`** -**home = > `home`.images table=`images_table`** - -**app = > web.app page=`home` host=127.0.0.1 port=18092** -**app = > `app`.static dir="web-fixtures/public" mount="/static"** -**app = > `app`.icons table=`icons_table`** - -> print text=marqdo web assets live starting -> `app`.listen diff --git a/tests/ext/web-assets-smoke.mq.md b/tests/ext/web-assets-smoke.mq.md deleted file mode 100644 index 53bb3eb..0000000 --- a/tests/ext/web-assets-smoke.mq.md +++ /dev/null @@ -1,92 +0,0 @@ ---- -title: web assets smoke -description: Offline icons / head / images assembly (no listen). -import web:ext/web/web.mq.md -import json:lib/json.mq.md ---- - -# main - -`icons_table` = - -|path|rel|type|sizes|url| -|---|---|---|---|---| -|"web-fixtures/public/favicon.png"|icon|"image/png"|32x32|"/favicon.ico"| -|"web-fixtures/public/favicon.svg"|icon|"image/svg+xml"|any|"/static/favicon.svg"| - -`head_table` = - -|rel|href|type|media| -|---|---|---|---| -|icon|"/favicon.ico"|"image/png"| -|stylesheet|"/static/print.css"|"text/css"|print| -|script|"/static/live.js"|| - -`images_table` = - -|src|alt|class|href|width|loading|caption| -|---|---|---|---|---|---|---| -|"/static/logo.svg"|Marqdo|brand-logo|"/"|48|eager|Brand| - -`seo` = - -| 行 | key | value | -|----|-----|-------| -| 1 | description | asset smoke | -| 2 | icon | "/favicon.ico" | -| 3 | og:image | "/static/logo.svg" | - -**home = > web.page title="Assets"** -**home = > `home`.head table=`head_table`** -**home = > `home`.images table=`images_table`** -**home = > `home`.meta meta=`seo`** - -**ih = > json.get value=`home` key="images_html"** -1. `ih` != "" - > print text=images-ok -2. * - > print text=images-fail - -**hd = > json.get value=`home` key="head"** -**n = > len `hd`** -1. `n` >= 3 - > print text=head-ok -2. * - > print text=head-fail - -**meta = > json.get value=`home` key="meta"** -**icon = > json.get value=`meta` key="icon"** -1. `icon` == "/favicon.ico" - > print text=meta-icon-ok -2. * - > print text=meta-icon-fail - -**app = > web.app page=`home` host=127.0.0.1 port=18091** -**app = > `app`.static dir="web-fixtures/public" mount="/static"** -**app = > `app`.icons table=`icons_table`** - -**icons = > json.get value=`app` key="icons"** -**ni = > len `icons`** -1. `ni` == 2 - > print text=icons-ok -2. * - > print text=icons-fail - -**sh = > json.get value=`app` key="site_head"** -**ns = > len `sh`** -1. `ns` >= 1 - > print text=site-head-ok -2. * - > print text=site-head-fail - -**preview = > web.make_images table=`images_table`** -1. `preview` != "" - > print text=make-images-ok -2. * - > print text=make-images-fail - -**hprev = > web.make_head table=`head_table`** -1. `hprev` != "" - > print text=make-head-ok -2. * - > print text=make-head-fail diff --git a/tests/ext/web-auth-custom-page.mq.md b/tests/ext/web-auth-custom-page.mq.md deleted file mode 100644 index 50cf1a4..0000000 --- a/tests/ext/web-auth-custom-page.mq.md +++ /dev/null @@ -1,25 +0,0 @@ ---- -title: web-auth-custom-page -description: Custom branded login owns GET /login; POST failure re-renders same shell with CSRF; no author JS. -import 网页:ext/web/网页.mq.md ---- - -# main - -`用户` = - -| 行 | 用户名 | 密码 | -|----|--------|------| -| 1 | alice | secret12 | - -**page = > 网页.页面 标题="Home" 引言="

home

"** -**login = > 网页.页面 标题="登录" 引言="

登录

"** -**login = > login.鉴权表单 动作="/login" 提交="登录" 表单id="login-form" 错误id="login-err" 表单插槽="#auth-mount" 种类="login"** - -**db = > 网页.数据库** -**app = > 网页.应用 页面=page 数据库=db 后台=假 主机="127.0.0.1" 端口=0** -**app = > app.路由 路径="/login" 页面=login** -**app = > app.鉴权 用户表=`用户` 会话时长=3600 登录路径="/login" 登录回跳="/"** - -> print text=web-auth-custom-page ok -*None* diff --git a/tests/ext/web-c0-admin-prefix.mq.md b/tests/ext/web-c0-admin-prefix.mq.md deleted file mode 100644 index 6f9d08f..0000000 --- a/tests/ext/web-c0-admin-prefix.mq.md +++ /dev/null @@ -1,72 +0,0 @@ ---- -title: web C0 admin prefix / route release -description: admin=False frees /admin; custom admin_prefix reserves only that mount. -import web:ext/web/web.mq.md -import json:lib/json.mq.md -import sys:lib/sys.mq.md ---- - -# main - -**首页 = > web.page title="home"** -**页 = > web.page title="news"** - -**应用 = > web.app page=`首页` admin=False** -**应用 = > `应用`.route path="/admin/news" page=`页`** -**routes = > json.get value=`应用` key="routes"** -**hit = > json.get value=`routes` key="/admin/news"** -1. `hit` - > print text=free-admin-ok -2. * - > print text=free-admin-fail - > sys.exit code=1 - -**应用3 = > web.app page=`首页` admin=True admin_prefix="/desk"** -**应用3 = > `应用3`.route path="/admin/news" page=`页`** -**routes3 = > json.get value=`应用3` key="routes"** -**hit3 = > json.get value=`routes3` key="/admin/news"** -1. `hit3` - > print text=prefix-frees-admin-ok -2. * - > print text=prefix-frees-admin-fail - > sys.exit code=1 - -**prefix = > json.get value=`应用3` key="admin_prefix"** -1. `prefix` == "/desk" - > print text=prefix-stored-ok -2. * - > print text=prefix-stored-fail - > sys.exit code=1 - -`用户表` = -| 用户名 | 密码 | 角色 | -|--------|------|------| -| admin | secret | admin | - -**应用4 = > web.app page=`首页` admin=True** -**应用4 = > `应用4`.auth users=`用户表` admin_prefix="/desk" login_redirect="/desk" logout_redirect="/desk/login"** -**prefix4 = > json.get value=`应用4` key="admin_prefix"** -**login4 = > json.get value=`应用4` key="login_redirect"** -**logout4 = > json.get value=`应用4` key="logout_redirect"** -**gates = > json.get value=`应用4` key="gates"** -**g0 = > at value=`gates` index=0** -**gpath = > json.get value=`g0` key="path"** -1. `prefix4` == "/desk" - 1. `login4` == "/desk" - 1. `logout4` == "/desk/login" - 1. `gpath` == "/desk" - > print text=auth-prefix-ok - 2. * - > print text=auth-gate-fail - > sys.exit code=1 - 2. * - > print text=auth-logout-fail - > sys.exit code=1 - 2. * - > print text=auth-login-fail - > sys.exit code=1 -2. * - > print text=auth-prefix-fail - > sys.exit code=1 - -> print text=c0-admin-ok diff --git a/tests/ext/web-c1-gates.mq.md b/tests/ext/web-c1-gates.mq.md deleted file mode 100644 index 70ea0eb..0000000 --- a/tests/ext/web-c1-gates.mq.md +++ /dev/null @@ -1,81 +0,0 @@ ---- -title: web C1 gate match / on_deny / exclude -description: Segment-boundary prefix; auth default redirect; custom gate fields. -import web:ext/web/web.mq.md -import json:lib/json.mq.md -import sys:lib/sys.mq.md ---- - -# main - -**首页 = > web.page title="home"** - -`用户表` = -| 用户名 | 密码 | 角色 | -|--------|------|------| -| admin | secret | admin | - -**应用 = > web.app page=`首页` admin=True** -**应用 = > `应用`.auth users=`用户表`** -**gates = > json.get value=`应用` key="gates"** -**g0 = > at value=`gates` index=0** -**path = > json.get value=`g0` key="path"** -**match = > json.get value=`g0` key="match"** -**deny = > json.get value=`g0` key="on_deny"** -**login = > json.get value=`应用` key="login_path"** -1. `path` == "/admin" - 1. `match` == "prefix" - 1. `deny` == "redirect" - 1. `login` == "/admin/login" - > print text=auth-default-gate-ok - 2. * - > print text=login-path-fail - > sys.exit code=1 - 2. * - > print text=on-deny-fail - > sys.exit code=1 - 2. * - > print text=match-fail - > sys.exit code=1 -2. * - > print text=path-fail - > sys.exit code=1 - -**应用2 = > web.app page=`首页` admin=False** -**应用2 = > `应用2`.gate path="/desk" roles="admin" match="prefix" on_deny="redirect" exclude="/desk/login"** -**gates2 = > json.get value=`应用2` key="gates"** -**g1 = > at value=`gates2` index=0** -**p2 = > json.get value=`g1` key="path"** -**m2 = > json.get value=`g1` key="match"** -**d2 = > json.get value=`g1` key="on_deny"** -**ex = > json.get value=`g1` key="exclude"** -1. `p2` == "/desk" - 1. `m2` == "prefix" - 1. `d2` == "redirect" - 1. `ex` - > print text=custom-gate-ok - 2. * - > print text=exclude-fail - > sys.exit code=1 - 2. * - > print text=custom-deny-fail - > sys.exit code=1 - 2. * - > print text=custom-match-fail - > sys.exit code=1 -2. * - > print text=custom-path-fail - > sys.exit code=1 - -**应用3 = > web.app page=`首页` admin=False** -**应用3 = > `应用3`.gate path="/write*" roles="admin,author"** -**gates3 = > json.get value=`应用3` key="gates"** -**g3 = > at value=`gates3` index=0** -**p3 = > json.get value=`g3` key="path"** -1. `p3` - > print text=star-gate-ok -2. * - > print text=star-gate-fail - > sys.exit code=1 - -> print text=c1-gate-ok diff --git a/tests/ext/web-c2-shell-layout.mq.md b/tests/ext/web-c2-shell-layout.mq.md deleted file mode 100644 index 60704de..0000000 --- a/tests/ext/web-c2-shell-layout.mq.md +++ /dev/null @@ -1,60 +0,0 @@ ---- -title: web C2 shell_css + layout -description: Offline render markers for shell modes and layouts. -import web:ext/web/web.mq.md -import json:lib/json.mq.md -import sys:lib/sys.mq.md ---- - -# main - -`链` = -| 标签 | 链接 | -|------|------| -| Home | / | -| Desk | /desk | - -**页 = > web.page title="c2" shell_css="off" layout="stacked"** -**页 = > json.set map=`页` key="nav" value=`链`** -**页 = > json.set map=`页` key="sidebar" value=`链`** -**html = > `页`.render** - -**a = > split value=`html` sep="layout-stacked"** -**na = > len value=`a`** -**b = > split value=`html` sep="has-sidebar"** -**nb = > len value=`b`** -**c = > split value=`html` sep="grid-template-columns:14rem"** -**nc = > len value=`c`** -1. `na` > 1 - 1. `nb` == 1 - 1. `nc` == 1 - > print text=stacked-off-ok - 2. * - > print text=grid-still-present - > sys.exit code=1 - 2. * - > print text=has-sidebar-leak - > sys.exit code=1 -2. * - > print text=stacked-missing - > sys.exit code=1 - -**裸 = > web.page title="bare" layout="bare" shell_css="minimal"** -**裸 = > json.set map=`裸` key="nav" value=`链`** -**裸 = > json.set map=`裸` key="sidebar" value=`链`** -**h2 = > `裸`.render** -**d = > split value=`h2` sep=" len value=`d`** -**e = > split value=`h2` sep="--ink:"** -**ne = > len value=`e`** -1. `nd` == 1 - 1. `ne` > 1 - > print text=bare-minimal-ok - 2. * - > print text=minimal-vars-missing - > sys.exit code=1 -2. * - > print text=bare-aside-leak - > sys.exit code=1 - -> print text=c2-shell-ok diff --git a/tests/ext/web-c3-style-head.mq.md b/tests/ext/web-c3-style-head.mq.md deleted file mode 100644 index 63fae8f..0000000 --- a/tests/ext/web-c3-style-head.mq.md +++ /dev/null @@ -1,91 +0,0 @@ ---- -title: web C3 style strict + head defer/version -description: Offline markers for quoted CSS cells and head script lifecycle. -import web:ext/web/web.mq.md -import sys:lib/sys.mq.md ---- - -# main - -`好` = -| 选择器 | 属性 | 值 | -|--------|------|-----| -| .box | grid-column | "1 / 5" | - -**css = > web.make_style name="t" table=`好` strict=True** -**a = > split value=`css` sep="1 / 5"** -**na = > len value=`a`** -1. `na` > 1 - > print text=quoted-css-ok -2. * - > print text=quoted-css-missing - > sys.exit code=1 - -`头` = -| 关系 | 地址 | 推迟 | 版本 | -|------|------|------|------| -| script | /static/a.js | 真 | 3 | -| stylesheet | /static/t.css | | 1 | - -**页 = > web.page title="c3" asset_version="appv"** -**页 = > `页`.head table=`头`** -**html = > `页`.render** -**b = > split value=`html` sep="a.js?v=3"** -**nb = > len value=`b`** -**c = > split value=`html` sep="t.css?v=1"** -**nc = > len value=`c`** -**d0 = > split value=`html` sep="script defer"** -**nd0 = > len value=`d0`** -1. `nb` > 1 - 1. `nc` > 1 - 1. `nd0` > 1 - > print text=defer-version-ok - 2. * - > print text=defer-attr-missing - > sys.exit code=1 - 2. * - > print text=css-version-missing - > sys.exit code=1 -2. * - > print text=defer-script-missing - > sys.exit code=1 - -`头2` = -| 关系 | 地址 | 推迟 | -|------|------|------| -| script | /static/b.js | 真 | - -**页2 = > web.page title="c3b" asset_version="2026-09-04"** -**页2 = > `页2`.head table=`头2`** -**h2 = > `页2`.render** -**d = > split value=`h2` sep="b.js?v=2026-09-04"** -**nd = > len value=`d`** -1. `nd` > 1 - > print text=asset-version-ok -2. * - > print text=asset-version-missing - > sys.exit code=1 - -`头3` = -| 关系 | 地址 | -|------|------| -| script | /static/sync.js | - -**页3 = > web.page title="c3c"** -**页3 = > `页3`.head table=`头3`** -**h3 = > `页3`.render** -**e = > split value=`h3` sep="sync.js"** -**ne = > len value=`e`** -**f = > split value=`h3` sep="script defer"** -**nf = > len value=`f`** -1. `ne` > 1 - 1. `nf` == 1 - > print text=sync-compat-ok - 2. * - > print text=unexpected-defer - > sys.exit code=1 -2. * - > print text=sync-script-missing - > sys.exit code=1 - -> print text=c3-style-head-ok diff --git a/tests/ext/web-c4-nav-when.mq.md b/tests/ext/web-c4-nav-when.mq.md deleted file mode 100644 index f91c508..0000000 --- a/tests/ext/web-c4-nav-when.mq.md +++ /dev/null @@ -1,75 +0,0 @@ ---- -title: web C4 conditional nav when/media -description: Offline render markers for nav when= and media= columns. -import web:ext/web/web.mq.md -import table:lib/table.mq.md -import sys:lib/sys.mq.md ---- - -# main - -`链` = -| 属性 | 值 | 样式 | 媒体 | 当 | -|------|-----|------|------|-----| -| Home | / | | | | -| Desk | /desk | | (max-width: 720px) | | -| Admin | /admin | | | auth | -| Login | /login | | | guest | -| Gone | /gone | | | hide | - -**客 = > web.page title="c4-guest" shell_css="off"** -**`客` = > table.put in=`客` at="nav" value=`链`** -**`客` = > table.put in=`客` at="_logged_in" value=False** -**hg = > `客`.render** - -**a = > split value=`hg` sep="/login"** -**na = > len value=`a`** -**b = > split value=`hg` sep="/admin"** -**nb = > len value=`b`** -**c = > split value=`hg` sep="/gone"** -**nc = > len value=`c`** -**d = > split value=`hg` sep="nav-mq-0"** -**nd = > len value=`d`** -**e = > split value=`hg` sep="@media not (max-width: 720px)"** -**ne = > len value=`e`** -1. `na` > 1 - 1. `nb` == 1 - 1. `nc` == 1 - 1. `nd` > 1 - 1. `ne` > 1 - > print text=guest-media-ok - 2. * - > print text=media-css-missing - > sys.exit code=1 - 2. * - > print text=media-class-missing - > sys.exit code=1 - 2. * - > print text=hide-leaked - > sys.exit code=1 - 2. * - > print text=auth-leaked-for-guest - > sys.exit code=1 -2. * - > print text=guest-login-missing - > sys.exit code=1 - -**户 = > web.page title="c4-user" shell_css="off"** -**`户` = > table.put in=`户` at="nav" value=`链`** -**`户` = > table.put in=`户` at="_logged_in" value=True** -**hu = > `户`.render** -**f = > split value=`hu` sep="/admin"** -**nf = > len value=`f`** -**g = > split value=`hu` sep="/login"** -**ng = > len value=`g`** -1. `nf` > 1 - 1. `ng` == 1 - > print text=auth-ok - 2. * - > print text=guest-leaked-for-user - > sys.exit code=1 -2. * - > print text=auth-admin-missing - > sys.exit code=1 - -> print text=c4-nav-ok diff --git a/tests/ext/web-cache-artifact-smoke.mq.md b/tests/ext/web-cache-artifact-smoke.mq.md new file mode 100644 index 0000000..3b2221b --- /dev/null +++ b/tests/ext/web-cache-artifact-smoke.mq.md @@ -0,0 +1,15 @@ +--- +title: ext/data cache smoke +import cache:ext/data/cache.mq.md +--- + +# main + +**c = > cache.cache url="memory:"** +> `c`.set key="k" value="v" ttl=60 +**got = > `c`.get key="k"** +**val = [value](got)** +1. `val` == "v" + > print text=cache-ok +2. * + > print text=cache-fail diff --git a/tests/ext/web-collab-bag-smoke.mq.md b/tests/ext/web-collab-bag-smoke.mq.md deleted file mode 100644 index 80d5739..0000000 --- a/tests/ext/web-collab-bag-smoke.mq.md +++ /dev/null @@ -1,26 +0,0 @@ ---- -title: web collab bag smoke -description: route_ws room+presence for collab doc -import web:ext/web/web.mq.md -import json:lib/json.mq.md -import sys:lib/sys.mq.md ---- - -# main - -**首页 = > web.page title="c"** -**应用 = > web.app page=`首页` admin=False** -**应用 = > `应用`.route_ws path="/live/{id}" mode="room" room_key="doc.{id}" presence=True** -**routes = > json.get value=`应用` key="ws_routes"** -**spec = > json.get value=`routes` key="/live/{id}"** -**mode = > json.get value=`spec` key="mode"** -**pr = > json.get value=`spec` key="presence"** -1. `mode` == "room" - 1. `pr` == True - > print text=collab-ws-bag-ok - 2. * - > print text=presence-fail - > sys.exit code=1 -2. * - > print text=mode-fail - > sys.exit code=1 diff --git a/tests/ext/web-content-smoke.mq.md b/tests/ext/web-content-smoke.mq.md deleted file mode 100644 index 4e40ab4..0000000 --- a/tests/ext/web-content-smoke.mq.md +++ /dev/null @@ -1,51 +0,0 @@ ---- -title: web content smoke (W4) -description: SEO meta + paginate bag (offline ABI). -import web:ext/web/web.mq.md -import plugin:lib/plugin.mq.md -import sys:lib/sys.mq.md ---- - -# main - -**p = > plugin.native_path name="web"** -1. `p` - > plugin.load path=`p` -2. * - > sys.exit code=1 - -`meta` = - -| 行 | 键 | 值 | -|----|-----|-----| -| 1 | title | My Site | -| 2 | description | A demo site | -| 3 | og:type | website | - -**page = > web.page title="Home"** -**page = > page.meta meta=`meta`** -**mm = [meta](page)** -**m = [title](mm)** -1. `m` == "My Site" - > print text=meta-ok -2. * - > print text=meta-fail - -**page = > page.paginate offset=0 limit=5 path="/"** -**poff = [offset]([paginate](page))** -1. `poff` == 0 - > print text=paginate-ok -2. * - > print text=paginate-fail - -`rows` = - -| 行 | title | slug | summary | -|----|-------|------|---------| -| 1 | Hello | /a | First post | - -**feed = > web_rss_build title="Blog" link="http://example.com" description="Demo" items=`rows`** -1. `feed` != "" - > print text=rss-ok -2. * - > print text=rss-fail diff --git a/tests/ext/web-db-cross-module-lib.mq.md b/tests/ext/web-db-cross-module-lib.mq.md deleted file mode 100644 index 32e16ad..0000000 --- a/tests/ext/web-db-cross-module-lib.mq.md +++ /dev/null @@ -1,26 +0,0 @@ ---- -title: web db cross-module lib -description: Opens sqlite, inits a tiny table, returns the db handle. -import web:ext/web/web.mq.md ---- - -## open - -**store = > web.db url="sqlite::memory:"** - -`fields` = - -| name | type | -|------|------| -| title | text | - -> `store`.init name=items fields=`fields` - -`seed` = - -| @ | title | -|---|-------| -| 1 | hello | - -> `store`.insert table=items rows=`seed` -*store* diff --git a/tests/ext/web-db-cross-module-smoke.mq.md b/tests/ext/web-db-cross-module-smoke.mq.md deleted file mode 100644 index c2aa86e..0000000 --- a/tests/ext/web-db-cross-module-smoke.mq.md +++ /dev/null @@ -1,24 +0,0 @@ ---- -title: web db cross-module smoke -description: Return a web.db handle from an imported module and call select in the entry module. -import web:ext/web/web.mq.md -import plugin:lib/plugin.mq.md -import sys:lib/sys.mq.md -import storemod:web-db-cross-module-lib.mq.md ---- - -# main - -**p = > plugin.native_path name="web"** -1. `p` - > plugin.load path=`p` -2. * - > sys.exit code=1 - -**store = > storemod.open** -**rows = > `store`.select table="items" limit=10** -**n = > len value=`rows`** -1. `n` >= 1 - > print text=cross-db-ok -2. * - > print text=cross-db-fail diff --git a/tests/ext/web-db-w2-smoke.mq.md b/tests/ext/web-db-w2-smoke.mq.md deleted file mode 100644 index fda8d13..0000000 --- a/tests/ext/web-db-w2-smoke.mq.md +++ /dev/null @@ -1,146 +0,0 @@ ---- -title: web db W2 smoke — 事务 / 分页 / 原生查询 / 计数 / 查询表达力 -import web:ext/web/web.mq.md -import json:lib/json.mq.md ---- - -# main - -**store = > web.db url="sqlite:web-fixtures/data/w2-smoke.db"** - -`字段` = - -| 字段 | 类型 | 可空 | -|------|------|------| -| title | text | 否 | -| body | text | 是 | -| views | int | 是 | - -> `store`.init name=posts fields=`字段` -> `store`.exec sql="DELETE FROM posts" - -`数据` = - -| title | body | views | -|-------|------|-------| -| Alpha | first | 10 | -| Beta | second | 20 | -| Gamma | third | 30 | -| Delta | fourth | 40 | - -> `store`.insert table=posts rows=`数据` - -**c = > `store`.count table="posts"** -1. `c` == 4 - > print text=count-ok -2. * - > print text=count-fail - -`视图条件` = - -| 字段 | 操作 | 值 | -|------|------|-----| -| views | = | 30 | - -**c2 = > `store`.count table="posts" where=`视图条件`** -1. `c2` == 1 - > print text=count-where-ok -2. * - > print text=count-where-fail - -**page1 = > `store`.paginate table="posts" limit=2 跳过=0** -**total1 = [total](page1)** -**p1r = [rows](page1)** -**n1 = > len value=`p1r`** -1. `total1` == 4 -1. `n1` == 2 - > print text=page-ok -2. * - > print text=page-fail - -**page2 = > `store`.paginate table="posts" limit=2 跳过=2** -**p2r = [rows](page2)** -**n2 = > len value=`p2r`** -1. `n2` == 2 - > print text=page2-ok -2. * - > print text=page2-fail - -`in条件` = - -| 字段 | 操作 | 值 | -|------|------|-----| -| title | in | "Alpha,Beta" | - -**in_rows = > `store`.select table="posts" where=`in条件` limit=10** -**nin = > len value=`in_rows`** -1. `nin` == 2 - > print text=in-ok -2. * - > print text=in-fail - -`between条件` = - -| 字段 | 操作 | 值 | -|------|------|-----| -| views | between | "20,35" | - -**bt_rows = > `store`.select table="posts" where=`between条件` limit=10** -**nbt = > len value=`bt_rows`** -1. `nbt` == 2 - > print text=between-ok -2. * - > print text=between-fail - -`or条件` = - -| 字段 | 操作 | 值 | 或 | -|------|------|-----|-----| -| title | = | Alpha | | -| title | = | Gamma | 是 | - -**or_rows = > `store`.select table="posts" where=`or条件` limit=10** -**nor = > len value=`or_rows`** -1. `nor` == 2 - > print text=or-ok -2. * - > print text=or-fail - -**agg = > `store`.query sql="SELECT title, views FROM posts WHERE views >= 30 ORDER BY views DESC"** -**nagg = [count](agg)** -1. `nagg` == 2 - > print text=query-ok -2. * - > print text=query-fail - -**txn = > `store`.事务** -`更多` = - -| title | body | views | -|-------|------|-------| -| Epsilon | fifth | 50 | - -> `txn`.insert table=posts rows=`更多` -> `txn`.提交 - -**c5 = > `store`.count table="posts"** -1. `c5` == 5 - > print text=txn-commit-ok -2. * - > print text=txn-commit-fail - -**txn2 = > `store`.事务** -`更多2` = - -| title | body | views | -|-------|------|-------| -| Zeta | sixth | 60 | - -> `txn2`.insert table=posts rows=`更多2` -> `txn2`.回滚 - -**c6 = > `store`.count table="posts"** -1. `c6` == 5 - > print text=txn-rollback-ok -2. * - > print text=txn-rollback-fail diff --git a/tests/ext/web-db-w6-smoke.mq.md b/tests/ext/web-db-w6-smoke.mq.md deleted file mode 100644 index d7ec2c4..0000000 --- a/tests/ext/web-db-w6-smoke.mq.md +++ /dev/null @@ -1,83 +0,0 @@ ---- -title: web db W6 smoke — migrate / FTS5 / published filter -import web:ext/web/web.mq.md ---- - -# main - -**store = > web.db url="sqlite:web-fixtures/data/w6-smoke.db"** - -`steps` = - -| 版本 | SQL | -|------|-----| -| 1 | CREATE TABLE IF NOT EXISTS posts (id INTEGER PRIMARY KEY AUTOINCREMENT, title TEXT NOT NULL, body TEXT, status TEXT NOT NULL DEFAULT 'draft') | -| 2 | CREATE TABLE IF NOT EXISTS comments (id INTEGER PRIMARY KEY AUTOINCREMENT, post_id INTEGER NOT NULL, body TEXT NOT NULL, status TEXT NOT NULL DEFAULT 'pending') | - -**m1 = > `store`.migrate steps=`steps`** -**a1 = [applied](m1)** -**n1 = > len value=`a1`** -1. `n1` == 2 - > print text=migrate-ok -2. * - > print text=migrate-fail - -**m2 = > `store`.migrate steps=`steps`** -**a2 = [applied](m2)** -**n2 = > len value=`a2`** -1. `n2` == 0 - > print text=migrate-idempotent-ok -2. * - > print text=migrate-idempotent-fail - -`rows` = - -| title | body | status | -|-------|------|--------| -| Alpha note | hello world search | published | -| Beta draft | secret draft body | draft | -| Gamma published | another hello | published | - -> `store`.insert table=posts rows=`rows` - -`pub` = - -| 字段 | 操作 | 值 | -|------|------|-----| -| status | = | published | - -**pc = > `store`.count table="posts" where=`pub`** -1. `pc` == 2 - > print text=published-filter-ok -2. * - > print text=published-filter-fail - -`comments` = - -| post_id | body | status | -|---------|------|--------| -| 1 | nice post | approved | -| 1 | spam | pending | - -> `store`.insert table=comments rows=`comments` -**cc = > `store`.count table="comments"** -1. `cc` == 2 - > print text=comments-ok -2. * - > print text=comments-fail - -> `store`.fts table="posts" columns="title,body" -**hit = > `store`.search table="posts" q="hello" limit=10** -**hn = [count](hit)** -1. `hn` >= 1 - > print text=fts-ok -2. * - > print text=fts-fail - -**rows2 = [rows](hit)** -**first = [1](rows2)** -**ft = [title](first)** -1. `ft` - > print text=fts-row-ok -2. * - > print text=fts-row-fail diff --git a/tests/ext/web-drivers-smoke.mq.md b/tests/ext/web-drivers-smoke.mq.md deleted file mode 100644 index 92c6a3e..0000000 --- a/tests/ext/web-drivers-smoke.mq.md +++ /dev/null @@ -1,72 +0,0 @@ ---- -title: web drivers smoke (W4) -description: memory cache + file storage + postgres URL shape (offline). -import web:ext/web/web.mq.md -import plugin:lib/plugin.mq.md -import sys:lib/sys.mq.md ---- - -# main - -**p = > plugin.native_path name="web"** -1. `p` - > plugin.load path=`p` -2. * - > sys.exit code=1 - - - -**c = > web.cache url="memory:drivers-smoke"** -> `c`.set key="k1" value="v1" ttl=60 -**g = > `c`.get key="k1"** -**gv = [value](g)** -1. `gv` == "v1" - > print text=cache-ok -2. * - > print text=cache-fail - -> `c`.del key="k1" -**ex = > `c`.exists key="k1"** -**eok = [ok](ex)** -1. `eok` - > print text=cache-del-fail -2. * - > print text=cache-del-ok - - - -**blob = > web.storage url="file:tests/ext/web-fixtures/data/drivers-blobs"** -> `blob`.put key="notes/a.txt" body="hello" content_type="text/plain" -**got = > `blob`.get key="notes/a.txt"** -**body = [body](got)** -1. `body` == "hello" - > print text=storage-ok -2. * - > print text=storage-fail - -**ls = > `blob`.list prefix="notes/"** -**n = [count](ls)** -1. `n` == 1 - > print text=storage-list-ok -2. * - > print text=storage-list-fail - -> `blob`.delete key="notes/a.txt" - - - -**pg = > web.db url="postgres://marqdo:marqdo@127.0.0.1:5432/marqdo"** -**purl = [url](pg)** -1. `purl` == "postgres://marqdo:marqdo@127.0.0.1:5432/marqdo" - > print text=postgres-url-ok -2. * - > print text=postgres-url-fail - - - -**s3 = > web.storage url="s3://bucket?endpoint=http://127.0.0.1:9000"** -**sb = [backend](s3)** -1. `sb` == "s3" - > print text=s3-open-ok -2. * - > print text=s3-open-fail diff --git a/tests/ext/web-entrydir-smoke.mq.md b/tests/ext/web-entrydir-smoke.mq.md deleted file mode 100644 index 95d9820..0000000 --- a/tests/ext/web-entrydir-smoke.mq.md +++ /dev/null @@ -1,39 +0,0 @@ ---- -title: web entry-dir relative path smoke -description: Relative db path resolves against the entry script dir, not cwd. -import web:ext/web/web.mq.md ---- - -# main - - - -**store = > web.db url="sqlite:entrydir-fixtures/data/entrydir.db"** - -`schema` = - -| 字段 | 类型 | -|------|------| -| title | text | - -> `store`.init name=items fields=`schema` - -`one` = - -| 行 | title | -|----|-------| -| 1 | hello | - -> `store`.insert table=items rows=`one` - -**rows = > `store`.select table="items" limit=10** -**n = > len value=`rows`** - -1. `n` == 1 - > print text=entrydir-db-ok -2. * - > print text=entrydir-db-fail diff --git a/tests/ext/web-form-embed-smoke.mq.md b/tests/ext/web-form-embed-smoke.mq.md deleted file mode 100644 index 29a6e5f..0000000 --- a/tests/ext/web-form-embed-smoke.mq.md +++ /dev/null @@ -1,33 +0,0 @@ ---- -title: web form embed smoke -description: Offline page.compose_form embeds form in main HTML (no listen). -import web:ext/web/web.mq.md -import json:lib/json.mq.md ---- - -# main - -`fields` = - -| 字段 | 标签 | 类型 | 必填 | 默认 | -|------|------|------|------|------| -| title | Title | text | true | | -| body | Body | textarea | false | | - -**f = > web.form table="articles" action="insert"** -**f = > `f`.fields fields=`fields`** - -**page = > web.page title="Compose" intro="

Compose

"** -**page = > `page`.compose_form id="article" form=`f`** - -**fid = > json.get value=`page` key="form_id"** -1. `fid` - > print text=form-id-ok -2. * - > print text=form-id-fail - -**html = > `page`.render** -1. `html` - > print text=render-ok -2. * - > print text=render-fail diff --git a/tests/ext/web-form-slot-smoke.mq.md b/tests/ext/web-form-slot-smoke.mq.md deleted file mode 100644 index 253d562..0000000 --- a/tests/ext/web-form-slot-smoke.mq.md +++ /dev/null @@ -1,43 +0,0 @@ ---- -title: web form slot smoke -description: compose_form target= mounts form inside intro HTML (GAP-11). -import web:ext/web/web.mq.md -import json:lib/json.mq.md -import text:lib/text.mq.md ---- - -# main - -`fields` = - -| 字段 | 标签 | 类型 | 必填 | 默认 | -|------|------|------|------|------| -| title | Title | text | true | | - -**f = > web.form table="notes" action="insert"** -**f = > `f`.fields fields=`fields`** - -**intro = "
voice
"** -**page = > web.page title="Slot" intro=`intro`** -**page = > `page`.compose_form id="note" form=`f` target="#qd-note-form-mount"** - -**tgt = > json.get value=`page` key="form_target"** -1. `tgt` - > print text=target-ok -2. * - > print text=target-fail - -**html = > `page`.render** -**`has_mount` = > text.contains text=`html` sub="qd-note-form-mount"** -**`has_form` = > text.contains text=`html` sub="site-form"** -**`order_ok` = > text.contains text=`html` sub="qd-note-form-mount\">
print text=slot-ok - 2. * - > print text=slot-order-fail - 2. * - > print text=slot-form-fail -2. * - > print text=slot-mount-fail diff --git a/tests/ext/web-form-smoke.mq.md b/tests/ext/web-form-smoke.mq.md deleted file mode 100644 index 565abe9..0000000 --- a/tests/ext/web-form-smoke.mq.md +++ /dev/null @@ -1,70 +0,0 @@ ---- -title: web form smoke -description: Offline form fields / validate / submit (no listen). -import web:ext/web/web.mq.md -import articles:web-fixtures/db/articles.mq.md -import json:lib/json.mq.md ---- - -# main - -**store = > web.db url="sqlite:web-fixtures/data/form-smoke.db"** -**schema = > articles.schema** -> `store`.init name=articles fields=`schema` - -`fields` = - -| 字段 | 标签 | 类型 | 必填 | 默认 | -|------|------|------|------|------| -| title | Title | text | true | | -| body | Body | textarea | false | | - -`rules` = - -| 字段 | 规则 | 消息 | -|------|------|------| -| title | required | Title is required | -| title | max:120 | Title is too long | - -**f = > web.form table="articles" action="insert"** -**f = > `f`.fields fields=`fields`** -**f = > `f`.rules rules=`rules`** - -`bad` = - -| title | body | -|-------|------| -| | hello | - -**v = > `f`.validate data=`bad`** -**ok = > json.get value=`v` key="ok"** -1. `ok` - > print text=validate-should-fail -2. * - > print text=validate-ok - -`good` = - -| title | body | -|-------|------| -| From form | Body via submit | - -**sub = > `f`.submit data=`good` db=`store`** -**sok = > json.get value=`sub` key="ok"** -1. `sok` - > print text=submit-ok -2. * - > print text=submit-fail - -**rows = > `store`.select table="articles" limit=10** -**n = > len value=`rows`** -1. `n` >= 1 - > print text=db-ok -2. * - > print text=db-fail - -**html = > `f`.render id="article"** -1. `html` - > print text=render-ok -2. * - > print text=render-fail diff --git a/tests/ext/web-form-source-live-server.mq.md b/tests/ext/web-form-source-live-server.mq.md deleted file mode 100644 index b2ceeb4..0000000 --- a/tests/ext/web-form-source-live-server.mq.md +++ /dev/null @@ -1,123 +0,0 @@ ---- -title: web form source live server -description: Request-context field sources — body only; author/slug stamped server-side. -import web:ext/web/web.mq.md -import plugin:lib/plugin.mq.md -import sys:lib/sys.mq.md ---- - -# main - -**p = > plugin.native_path name="web"** -1. `p` - > plugin.load path=`p` -2. * - > sys.exit code=1 - -`post_schema` = - -| 字段 | 类型 | 必填 | -|------|------|------| -| id | integer | false | -| slug | text | true | -| title | text | true | -| content | text | true | - -`comment_schema` = - -| 字段 | 类型 | 必填 | -|------|------|------| -| id | integer | false | -| post_slug | text | true | -| author | text | true | -| body | text | true | -| created_at | text | false | - -**store = > web.db url="sqlite:web-fixtures/data/form-source-live.db"** -> `store`.init name=posts fields=`post_schema` -> `store`.init name=comments fields=`comment_schema` -> `store`.exec sql="DELETE FROM comments" -> `store`.exec sql="DELETE FROM posts" - -`seed` = - -| slug | title | content | -|------|-------|---------| -| hello | Hello | Body of hello | - -> `store`.insert table=posts rows=`seed` - -`detail` = - -| 属性 | 值 | 样式 | -|------|-----|------| -| title | posts.title | | -| body | posts.content | | - -`post_q` = - -| 字段 | 操作 | 值 | -|------|------|-----| -| slug | = | {slug} | - -`comment_fields` = - -| 字段 | 标签 | 类型 | 必填 | 默认 | 来源 | -|------|------|------|------|------|------| -| body | Comment | textarea | true | | client | -| author | | text | true | | session.username | -| post_slug | | text | true | | route.slug | -| created_at | | text | false | | now | - -`comment_rules` = - -| 字段 | 规则 | 消息 | -|------|------|------| -| body | required | body required | -| author | required | login required | -| post_slug | required | slug required | - -**cf = > web.form table="comments" action="insert"** -**cf = > `cf`.fields fields=`comment_fields`** -**cf = > `cf`.rules rules=`comment_rules`** - -`comment_cards` = - -| 属性 | 值 | 样式 | -|------|-----|------| -| title | comments.author | | -| body | comments.body | | -| meta | comments.created_at | | - -`comment_q` = - -| 字段 | 操作 | 值 | -|------|------|-----| -| post_slug | = | {slug} | - -**post = > web.page title="Post" intro="

Comments

"** -**post = > `post`.compose_main main=`detail`** -**post = > `post`.query query=`post_q`** -**post = > `post`.detail detail=True** -**post = > `post`.compose_list main=`comment_cards` query=`comment_q` order="-created_at" target="#comment-list"** -**post = > `post`.compose_form form=`cf` id="comment" target="#comment-form-mount"** - -`users` = - -| 行 | 用户 | 密码 | -|----|------|------| -| 1 | alice | secret | - -**app = > web.app page=`post` db=`store` port=18117** -**app = > `app`.route path="/post/{slug}" page=`post`** -**app = > `app`.auth users=`users` login_path="/login" login_redirect="/" session_ttl=3600** -**app = > `app`.mount_form id="comment" form=`cf`** - -`api` = - -| 路径 | 方法 | 表 | 条件 | 排序 | 上限 | -|------|------|----|------|------|------| -| /api/comments | GET | comments | | "-created_at" | 50 | - -**app = > `app`.configure json=`api`** -> `app`.listen diff --git a/tests/ext/web-g12-api-key-smoke.mq.md b/tests/ext/web-g12-api-key-smoke.mq.md deleted file mode 100644 index 6a50c62..0000000 --- a/tests/ext/web-g12-api-key-smoke.mq.md +++ /dev/null @@ -1,30 +0,0 @@ ---- -title: web G12 API key smoke (W-G12) -description: Offline web_api_key_check via Go libweb.so. -import plugin:lib/plugin.mq.md ---- - -# main - -**p = "../../plugins/web/build/libweb.so"** -> plugin.load path=`p` - -**pepper = "smoke-pepper"** - -`keys` = - -| hash | scopes | -|------|--------| -| 0ae9134cca7eff9d756fbf52402ee28ae0c2be22f01e53653e4fe86021479703 | read,api | - -**ok = > web_api_key_check key="smoke-secret" authorization="" pepper=`pepper` keys=`keys`** -1. [ok](ok) - > print text=api-key-ok -2. * - > print text=api-key-fail - -**bad = > web_api_key_check key="wrong" authorization="" pepper=`pepper` keys=`keys`** -1. [ok](bad) - > print text=api-key-bad-ok -2. * - > print text=api-key-bad-fail diff --git a/tests/ext/web-go-abi-smoke.mq.md b/tests/ext/web-go-abi-smoke.mq.md deleted file mode 100644 index fe1dbb5..0000000 --- a/tests/ext/web-go-abi-smoke.mq.md +++ /dev/null @@ -1,16 +0,0 @@ ---- -title: web Go ABI smoke (W-G0) -description: Load Go libweb.so; probe web_go_ready + web_page_new. -import plugin:lib/plugin.mq.md ---- - -# main - -**p = "../../plugins/web/build/libweb.so"** -> plugin.load path=`p` - -**r = > web_go_ready** -> print text=`r` - -**page = > web_page_new title="Go Web" intro="W-G0" shell_css="" layout="" asset_version=""** -> print text=`page` diff --git a/tests/ext/web-hosting-helpers.mq.md b/tests/ext/web-hosting-helpers.mq.md deleted file mode 100644 index db9c2b0..0000000 --- a/tests/ext/web-hosting-helpers.mq.md +++ /dev/null @@ -1,23 +0,0 @@ ---- -title: web hosting live helpers -description: Tiny lib used by hosting live-server invoke route (nested plugin call). -import web:ext/web/web.mq.md ---- - -## echo -+ `msg`="" -+ `payload`=None - -Nested plugin call (`web.page`) while `app.listen` is the outer plugin frame — -must not clear GLOBAL_HOST so a second HTTP invoke still works. - -**pg = > web.page title=`msg`** -**title = [title](pg)** - -`out` = - -| ok | msg | title | -|----|-----|-------| -| true | `msg` | `title` | - -*out* diff --git a/tests/ext/web-hosting-live-server.mq.md b/tests/ext/web-hosting-live-server.mq.md deleted file mode 100644 index 7e1599b..0000000 --- a/tests/ext/web-hosting-live-server.mq.md +++ /dev/null @@ -1,22 +0,0 @@ ---- -title: web hosting live server -description: Listen with proxy (→ mock upstream) and invoke routes for gold.rs. -import web:ext/web/web.mq.md -import plugin:lib/plugin.mq.md -import sys:lib/sys.mq.md -import demo:web-hosting-helpers.mq.md ---- - -# main - -**p = > plugin.native_path name="web"** -1. `p` - > plugin.load path=`p` -2. * - > sys.exit code=1 - -**pg = > web.page title="hosting-live"** -**app = > web.app page=`pg` host=127.0.0.1 port=18141** -**app = > `app`.proxy path="/proxy/sse" upstream="http://127.0.0.1:18142/sse" stream=True methods="POST"** -**app = > `app`.invoke path="/api/echo" fn="demo.echo" method="POST" body="json"** -> `app`.listen diff --git a/tests/ext/web-intro-compose.mq.md b/tests/ext/web-intro-compose.mq.md deleted file mode 100644 index 8c45e06..0000000 --- a/tests/ext/web-intro-compose.mq.md +++ /dev/null @@ -1,55 +0,0 @@ ---- -title: web compose_intro bind table -description: Intro uses the same front/back/style bind as compose_main. -import web:ext/web/web.mq.md -import sys:lib/sys.mq.md ---- - -# main - -`intro` = - -| front | back | style | -|-------|------|-------| -| kicker | Demo kicker | kicker | -| title | Hello | intro_title | -| lede | "Try code and [link](/x)." | lede | -| claim | A | claim | -| claim | B | claim | -| step | First step | step | - -**page = > web.page title="Intro bind"** -**page = > page.compose_intro intro=intro** -**html = > page.render** - -**a = > split value=`html` sep="class=\"kicker\""** -**na = > len value=`a`** -**b = > split value=`html` sep="class=\"intro_title\""** -**nb = > len value=`b`** -**c = > split value=`html` sep="href=\"/x\""** -**nc = > len value=`c`** -**d = > split value=`html` sep="class=\"claim\""** -**nd = > len value=`d`** -**e = > split value=`html` sep="class=\"steps\""** -**ne = > len value=`e`** -1. `na` > 1 - 1. `nb` > 1 - 1. `nc` > 1 - 1. `nd` > 1 - 1. `ne` > 1 - > print text=compose-intro-ok - 2. * - > print text=compose-intro-steps-missing - > sys.exit code=1 - 2. * - > print text=compose-intro-claim-missing - > sys.exit code=1 - 2. * - > print text=compose-intro-link-missing - > sys.exit code=1 - 2. * - > print text=compose-intro-title-missing - > sys.exit code=1 -2. * - > print text=compose-intro-kicker-missing - > sys.exit code=1 diff --git a/tests/ext/web-middleware-live-server.mq.md b/tests/ext/web-middleware-live-server.mq.md deleted file mode 100644 index 3ce4b67..0000000 --- a/tests/ext/web-middleware-live-server.mq.md +++ /dev/null @@ -1,62 +0,0 @@ ---- -title: web middleware live server -description: Offline-assembled app that listens with CORS/security/compress/body_limit/json. -import web:ext/web/web.mq.md -import plugin:lib/plugin.mq.md -import sys:lib/sys.mq.md ---- - -# main - - - -**p = > plugin.native_path name="web"** -1. `p` - > plugin.load path=`p` -2. * - > sys.exit code=1 - -`schema` = - -| 字段 | 类型 | -|------|------| -| title | text | -| body | text | - -**store = > web.db url="sqlite:web-fixtures/data/mw-live.db"** -> `store`.init name=articles fields=`schema` -> `store`.exec sql="DELETE FROM articles" - -`rows` = - -| title | body | -|-------|------| -| Hello | first post | - -> `store`.insert table=articles rows=`rows` - -**pg = > web.page title="live"** -**app = > web.app page=`pg` db=`store` port=18099** - -`cors` = - -| 允许来源 | 方法 | 头 | 暴露头 | 凭证 | -|----------|------|----|--------|------| -| https://a.example | GET,POST | Content-Type | X-Total | true | - -`sec` = - -| 头 | 值 | -|----|----| -| X-Frame-Options | DENY | -| X-Content-Type-Options | nosniff | - -`api` = - -| 路径 | 方法 | 表 | 条件 | 排序 | 上限 | -|------|------|----|----|----|------| -| /api/posts | GET | articles | | | 10 | -| /api/publish | POST | articles | | | 10 | - -**app = > `app`.configure cors=`cors` security=`sec` compress=True body_limit=1000 json=`api`** -> `app`.listen diff --git a/tests/ext/web-middleware-smoke.mq.md b/tests/ext/web-middleware-smoke.mq.md deleted file mode 100644 index e778206..0000000 --- a/tests/ext/web-middleware-smoke.mq.md +++ /dev/null @@ -1,147 +0,0 @@ ---- -title: web middleware smoke -description: Offline assemble of CORS/security/compress/json middleware (no listen). -import web:ext/web/web.mq.md -import plugin:lib/plugin.mq.md -import sys:lib/sys.mq.md ---- - -# main - - - -**p = > plugin.native_path name="web"** -1. `p` - > plugin.load path=`p` -2. * - > sys.exit code=1 - - - -`cors` = - -| 允许来源 | 方法 | 头 | 暴露头 | 凭证 | -|----------|------|----|--------|------| -| https://a.example | GET,POST | Content-Type,Authorization | X-Total | true | -| https://b.example | GET | Content-Type | | | - - - -`sec` = - -| 头 | 值 | -|----|----| -| X-Frame-Options | DENY | -| X-Content-Type-Options | nosniff | -| Content-Security-Policy | default-src 'self' | - - - -`api` = - -| 路径 | 方法 | 表 | 条件 | 排序 | 上限 | -|------|------|----|----|----|------| -| /api/posts | GET | articles | | "-created_at" | 20 | -| /api/publish | POST | articles | | | 10 | - - - -**pg = > web.page title="mw"** -**app = > web.app page=`pg`** -**app = > `app`.configure cors=`cors` security=`sec` compress=True body_limit=1048576 json=`api`** - -**mw = [middleware](app)** - - - -**cobj = [cors](mw)** -**origins = [allow_origins](cobj)** -**o0 = [1](origins)** -1. `o0` == "https://a.example" - > print text=cors-origin-ok -2. * - > print text=cors-origin-fail - -**methods = [methods](cobj)** -**m1 = [2](methods)** -1. `m1` == "POST" - > print text=cors-method-ok -2. * - > print text=cors-method-fail - -**expose = [expose_headers](cobj)** -**e0 = [1](expose)** -1. `e0` == "X-Total" - > print text=cors-expose-ok -2. * - > print text=cors-expose-fail - -**cred = [credentials](cobj)** -1. `cred` - > print text=cors-cred-ok -2. * - > print text=cors-cred-fail - - - -**secmap = [security](mw)** -**frame = [X-Frame-Options](secmap)** -1. `frame` == "DENY" - > print text=security-frame-ok -2. * - > print text=security-frame-fail - -**csp = [Content-Security-Policy](secmap)** -1. `csp` == "default-src 'self'" - > print text=security-csp-ok -2. * - > print text=security-csp-fail - - - -**comp = [compress](mw)** -1. `comp` - > print text=compress-ok -2. * - > print text=compress-fail - -**bl = [body_limit](mw)** -1. `bl` == 1048576 - > print text=body-limit-ok -2. * - > print text=body-limit-fail - - - -**jmap = [json_routes](mw)** -**posts = [api/posts](jmap)** -**pok = [method](posts)** -1. `pok` == "GET" - > print text=json-get-ok -2. * - > print text=json-get-fail - -**ptable = [table](posts)** -1. `ptable` == "articles" - > print text=json-table-ok -2. * - > print text=json-table-fail - -**porder = [order](posts)** -1. `porder` == "-created_at" - > print text=json-order-ok -2. * - > print text=json-order-fail - -**plimit = [limit](posts)** -1. `plimit` == 20 - > print text=json-limit-ok -2. * - > print text=json-limit-fail - -**pub = [api/publish](jmap)** -**pmethod = [method](pub)** -1. `pmethod` == "POST" - > print text=json-post-ok -2. * - > print text=json-post-fail diff --git a/tests/ext/web-net-smoke.mq.md b/tests/ext/web-net-smoke.mq.md deleted file mode 100644 index 44b4eff..0000000 --- a/tests/ext/web-net-smoke.mq.md +++ /dev/null @@ -1,148 +0,0 @@ ---- -title: web network-extension smoke -description: Session/auth/ws ABI primitives (offline). -import web:ext/web/web.mq.md -import plugin:lib/plugin.mq.md -import sys:lib/sys.mq.md ---- - -# main - - - -**p = > plugin.native_path name="web"** -1. `p` - > plugin.load path=`p` -2. * - > sys.exit code=1 - - - -`users` = - -| 行 | 用户 | 密码 | -|----|------|------| -| 1 | admin | secret | -| 2 | 站长 | pw123 | - - - -**sess = > web_session_new ttl_sec=120** -**sid = [id](sess)** -1. `sid` != "" - > print text=session-new-ok -2. * - > print text=session-new-fail - -**set1 = > web_session_set id=`sid` key="theme" value="dark"** -**ok1 = [ok](set1)** -1. `ok1` - > print text=session-set-ok -2. * - > print text=session-set-fail - -**get1 = > web_session_get id=`sid` key="theme"** -**v1 = [value](get1)** -1. `v1` == "dark" - > print text=session-get-ok -2. * - > print text=session-get-fail - -**del1 = > web_session_del id=`sid` key="theme"** -**ok2 = [ok](del1)** -1. `ok2` - > print text=session-del-ok -2. * - > print text=session-del-fail - -**get2 = > web_session_get id=`sid` key="theme"** -**ok3 = [ok](get2)** -1. `ok3` - > print text=session-del-confirm-fail -2. * - > print text=session-del-confirm - - - -**login = > web_auth_login username="admin" password="secret" users=`users` session_ttl=120** -**lok = [ok](login)** -1. `lok` - > print text=auth-login-ok -2. * - > print text=auth-login-fail - -**sid2 = [session_id](login)** -**check = > web_auth_check session_id=`sid2`** -**cok = [ok](check)** -1. `cok` - > print text=auth-check-ok -2. * - > print text=auth-check-fail - -**badlogin = > web_auth_login username="admin" password="wrong" users=`users` session_ttl=120** -**bok = [ok](badlogin)** -1. `bok` - > print text=auth-bad-should-fail -2. * - > print text=auth-bad-ok - -**zhlogin = > web_auth_login username="站长" password="pw123" users=`users` session_ttl=120** -**zhok = [ok](zhlogin)** -1. `zhok` - > print text=auth-zh-ok -2. * - > print text=auth-zh-fail - -**logout = > web_auth_logout session_id=`sid2`** -**dok = [ok](logout)** -1. `dok` - > print text=auth-logout-ok -2. * - > print text=auth-logout-fail - -**check2 = > web_auth_check session_id=`sid2`** -**cok2 = [ok](check2)** -1. `cok2` - > print text=auth-logout-confirm-fail -2. * - > print text=auth-logout-confirm - - - -**pg = > web.page title="ws-test"** -**app = > web.app page=`pg` admin=True** -**app = > `app`.route_ws path="/live" echo=True** -**routes = [ws_routes](app)** -**has_live = [/live](routes)** -1. `has_live` - > print text=ws-route-ok -2. * - > print text=ws-route-fail - -**app = > `app`.auth users=`users` session_ttl=120** -**authobj = [auth](app)** -**ausers = [users](authobj)** -**au1 = [用户]([1](ausers))** -**ou1 = [用户]([1](users))** -1. `au1` == `ou1` - > print text=app-auth-ok -2. * - > print text=app-auth-fail - - - -**authz = > web.auth users=`users` session_ttl=120** -**login2 = > `authz`.login username="admin" password="secret"** -**lok2 = [ok](login2)** -1. `lok2` - > print text=ext-auth-ok -2. * - > print text=ext-auth-fail - -**ws = > web.ws timeout_sec=1** -**badurl = > `ws`.connect url="ws://127.0.0.1:1" message="hi"** -**bwok = [ok](badurl)** -1. `bwok` - > print text=ws-connect-should-fail -2. * - > print text=ws-connect-error-ok \ No newline at end of file diff --git a/tests/ext/web-p3-live-server.mq.md b/tests/ext/web-p3-live-server.mq.md deleted file mode 100644 index 7868816..0000000 --- a/tests/ext/web-p3-live-server.mq.md +++ /dev/null @@ -1,23 +0,0 @@ ---- -title: web P3 live — gallery HTML + download ETag -import web:ext/web/web.mq.md -import plugin:lib/plugin.mq.md -import sys:lib/sys.mq.md ---- - -# main - -**p = > plugin.native_path name="web"** -1. `p` - > plugin.load path=`p` -2. * - > sys.exit code=1 - -**blob = > web.storage url="file:web-fixtures/data/p3-live-blobs"** -> `blob`.put key="uploads/hello.txt" body="etag-body" content_type="text/plain" - -**pg = > web.page title="p3-live"** -**app = > web.app page=`pg` port=18131** -**app = > `app`.download path="/_media/{*key}" storage=`blob` disposition="inline"** -**app = > `app`.gallery path="/gallery" storage=`blob` prefix="uploads/" title="P3 Gallery" download_base="/_media"** -> `app`.listen diff --git a/tests/ext/web-p3-smoke.mq.md b/tests/ext/web-p3-smoke.mq.md deleted file mode 100644 index ad071c5..0000000 --- a/tests/ext/web-p3-smoke.mq.md +++ /dev/null @@ -1,107 +0,0 @@ ---- -title: web P3 smoke — audit timestamps, FK, RBAC, gallery (offline) -import web:ext/web/web.mq.md -import plugin:lib/plugin.mq.md -import sys:lib/sys.mq.md -import json:lib/json.mq.md ---- - -# main - -**p = > plugin.native_path name="web"** -1. `p` - > plugin.load path=`p` -2. * - > sys.exit code=1 - -**store = > web.db url="sqlite:web-fixtures/data/p3-smoke.db"** -> `store`.exec sql="DROP TABLE IF EXISTS comments" -> `store`.exec sql="DROP TABLE IF EXISTS posts" - -`post_fields` = - -| 字段 | 类型 | 可空 | -|------|------|------| -| id | int | 否 | -| title | text | 否 | -| created_at | timestamp | 是 | -| updated_at | timestamp | 是 | - -> `store`.init name="posts" fields=`post_fields` - -`comment_fields` = - -| 字段 | 类型 | 可空 | 外键 | -|------|------|------|------| -| id | int | 否 | | -| post_id | int | 否 | posts | -| body | text | 否 | | - -> `store`.init name="comments" fields=`comment_fields` - -`rows` = - -| @ | title | -|---|-------| -| 1 | Hello P3 | - -> `store`.insert table="posts" rows=`rows` - -**got = > `store`.get table="posts" id=1** -**ca = [created_at](got)** -1. `ca` - > print text=audit-insert-ok -2. * - > print text=audit-insert-fail - -**upd = > json.parse text={"title":"Hello P3b"}** -> `store`.update table="posts" id=1 row=`upd` -**got2 = > `store`.get table="posts" id=1** -**ua2 = [updated_at](got2)** -1. `ua2` - > print text=audit-update-ok -2. * - > print text=audit-update-fail - -**fk = > `store`.query sql="SELECT sql FROM sqlite_master WHERE type='table' AND name='comments'"** -**fkddl = [sql]([1]([rows](fk)))** -1. `fkddl` - > print text=fk-ok -2. * - > print text=fk-fail - -`users` = - -| username | password | role | -|----------|----------|------| -| admin | secret | admin | -| alice | secret | author | - -**login = > web_auth_login username="alice" password="secret" users=`users` session_ttl=120** -**role = [role](login)** -1. `role` == "author" - > print text=rbac-login-ok -2. * - > print text=rbac-login-fail - -**pg = > web.page title="p3"** -**app = > web.app page=`pg` port=18130** -**app = > `app`.auth users=`users`** -**app = > `app`.gate path="/write*" roles="admin,author"** -**gates = [gates](app)** -**ng = > len value=`gates`** -**gpath = [path]([1](gates))** -1. `ng` == 1 and `gpath` == "/write*" - > print text=rbac-gate-ok -2. * - > print text=rbac-gate-fail - -**blob = > web.storage url="file:web-fixtures/data/p3-gallery"** -> `blob`.put key="uploads/a.txt" body="hi" content_type="text/plain" -**app = > `app`.gallery path="/gallery" storage=`blob` prefix="uploads/" title="Media" download_base="/_media"** -**gal = [gallery_routes](app)** -**g = [/gallery](gal)** -1. `g` - > print text=gallery-ok -2. * - > print text=gallery-fail diff --git a/tests/ext/web-part-smoke.mq.md b/tests/ext/web-part-smoke.mq.md deleted file mode 100644 index c4d6370..0000000 --- a/tests/ext/web-part-smoke.mq.md +++ /dev/null @@ -1,52 +0,0 @@ ---- -title: web part smoke -description: Routed pages stamp _route and emit {path}/_part/{id} slot sources. -import web:ext/web/web.mq.md -import nav:web-fixtures/components/nav.mq.md -import side:web-fixtures/components/side.mq.md -import foot:web-fixtures/components/foot.mq.md -import json:lib/json.mq.md ---- - -# main - -`layout` = - -| 组件 | 样式 | -|------|------| -| nav.`nav` | | -| side.`side` | | -| foot.`foot` | | - -**home = > web.page title="Home" intro="

Home

"** -**home = > `home`.compose_components components=`layout`** - -**about = > web.page title="About" intro="

About

"** -**about = > `about`.compose_components components=`layout`** - -**app = > web.app page=`home` host=127.0.0.1 port=18081** -**app = > `app`.route path="/about" page=`about`** - -**routes = > json.get value=`app` key="routes"** -**routed = > json.get value=`routes` key="/about"** -**route = > json.get value=`routed` key="_route"** -1. `route` == "/about" - > print text=route-stamp-ok -2. * - > print text=route-stamp-fail - -**home_html = > `home`.render** -**home_chunks = > split value=`home_html` sep="/_part/"** -**hn = > len value=`home_chunks`** -1. `hn` >= 2 - > print text=home-part-ok -2. * - > print text=home-part-fail - -**about_html = > `routed`.render** -**about_chunks = > split value=`about_html` sep="/about/_part/"** -**an = > len value=`about_chunks`** -1. `an` >= 2 - > print text=route-part-ok -2. * - > print text=route-part-fail diff --git a/tests/ext/web-proxy-invoke-smoke.mq.md b/tests/ext/web-proxy-invoke-smoke.mq.md deleted file mode 100644 index 5e3c019..0000000 --- a/tests/ext/web-proxy-invoke-smoke.mq.md +++ /dev/null @@ -1,75 +0,0 @@ ---- -title: web proxy/invoke smoke -description: Offline assemble of app.proxy and app.invoke routes (no listen). -import web:ext/web/web.mq.md -import plugin:lib/plugin.mq.md -import sys:lib/sys.mq.md ---- - -# main - -**p = > plugin.native_path name="web"** -1. `p` - > plugin.load path=`p` -2. * - > sys.exit code=1 - -`proxy_tbl` = - -| path | upstream | stream | strip_prefix | methods | headers_from_env | timeout_ms | -|------|----------|--------|--------------|---------|------------------|------------| -| /proxy/chat | $OPENAI_BASE_URL | True | /proxy | POST | OPENAI_API_KEY=Authorization | 60000 | - -`invoke_tbl` = - -| path | method | fn | body | return | -|------|--------|-----|------|--------| -| /api/echo | POST | demo.echo | json | json | - -**pg = > web.page title="proxy-invoke"** -**app = > web.app page=`pg`** -**app = > `app`.configure proxy=`proxy_tbl` invoke=`invoke_tbl`** -**app = > `app`.proxy path="/v1/stream" upstream="https://example.com/v1/chat" stream=True headers_from_env="TOKEN=X-Token"** -**app = > `app`.invoke path="/api/ping" fn="demo.ping" method="GET" body="query"** - -**proutes = [proxy_routes](app)** -**chat = [proxy/chat](proutes)** -**up = [upstream](chat)** -1. `up` == "$OPENAI_BASE_URL" - > print text=proxy-table-ok -2. * - > print text=proxy-table-fail - -**stream = [stream](chat)** -1. `stream` - > print text=proxy-stream-ok -2. * - > print text=proxy-stream-fail - -**hdr = [headers_from_env](chat)** -1. `hdr` == "OPENAI_API_KEY=Authorization" - > print text=proxy-env-ok -2. * - > print text=proxy-env-fail - -**v1 = [v1/stream](proutes)** -**v1u = [upstream](v1)** -1. `v1u` == "https://example.com/v1/chat" - > print text=proxy-method-ok -2. * - > print text=proxy-method-fail - -**iroutes = [invoke_routes](app)** -**echo = [api/echo](iroutes)** -**efn = [fn](echo)** -1. `efn` == "demo.echo" - > print text=invoke-table-ok -2. * - > print text=invoke-table-fail - -**ping = [api/ping](iroutes)** -**pm = [method](ping)** -1. `pm` == "GET" - > print text=invoke-method-ok -2. * - > print text=invoke-method-fail diff --git a/tests/ext/web-rbac-artifact-smoke.mq.md b/tests/ext/web-rbac-artifact-smoke.mq.md new file mode 100644 index 0000000..0328e59 --- /dev/null +++ b/tests/ext/web-rbac-artifact-smoke.mq.md @@ -0,0 +1,18 @@ +--- +title: ext/security rbac smoke +import rbac:ext/security/rbac.mq.md +--- + +# main + +**gate = > rbac.rbac** +**r = > `gate`.can permissions="desk:access,posts:read" needed="desk:access"** +**ok = [ok](r)** +**allowed = [allowed](r)** +1. `ok` + 1. `allowed` + > print text=rbac-ok + 2. * + > print text=rbac-fail +2. * + > print text=rbac-fail diff --git a/tests/ext/web-rbac-can-smoke.mq.md b/tests/ext/web-rbac-can-smoke.mq.md deleted file mode 100644 index 6861f7b..0000000 --- a/tests/ext/web-rbac-can-smoke.mq.md +++ /dev/null @@ -1,56 +0,0 @@ ---- -title: web RBAC smoke -description: app.rbac flag + gate permissions CSV stored on app bag -import web:ext/web/web.mq.md -import json:lib/json.mq.md ---- - -# main - -> print text=rbac-smoke-start - -**首页 = > web.page title="home"** -`用户表` = -| 用户名 | 密码 | 角色 | -|--------|------|------| -| admin | secret | admin | - -**应用 = > web.app page=`首页` admin=False** -**应用 = > `应用`.enable_rbac** -**authbag = > json.get value=`应用` key="auth"** -**rbac_on = > json.get value=`authbag` key="rbac"** -1. `rbac_on` == True - > print text=rbac-flag-ok -2. * - > print text=rbac-flag-fail - -**应用 = > `应用`.auth users=`用户表` login_path="/login"** -**authbag2 = > json.get value=`应用` key="auth"** -**rbac_kept = > json.get value=`authbag2` key="rbac"** -1. `rbac_kept` == True - > print text=rbac-survives-auth-ok -2. * - > print text=rbac-survives-auth-fail - -**应用 = > `应用`.gate path="/desk" permissions="desk:access" match="prefix" on_deny="redirect" exclude="/login"** -**gates = > json.get value=`应用` key="gates"** -**g1 = > at value=`gates` index=1** -**perms = > json.get value=`g1` key="permissions"** -**p0 = > at value=`perms` index=0** -1. `p0` == "desk:access" - > print text=gate-perm-ok -2. * - > print text=gate-perm-fail - -**应用2 = > web.app page=`首页` admin=False** -**应用2 = > `应用2`.gate path="/desk/roles" permissions="roles:manage" roles="editor" match="exact"** -**gates2 = > json.get value=`应用2` key="gates"** -**g0 = > at value=`gates2` index=0** -**perms2 = > json.get value=`g0` key="permissions"** -**p1 = > at value=`perms2` index=0** -1. `p1` == "roles:manage" - > print text=gate-roles-manage-ok -2. * - > print text=gate-roles-manage-fail - -> print text=rbac-smoke-done diff --git a/tests/ext/web-rbac-db-smoke.mq.md b/tests/ext/web-rbac-db-smoke.mq.md deleted file mode 100644 index f9a4f58..0000000 --- a/tests/ext/web-rbac-db-smoke.mq.md +++ /dev/null @@ -1,49 +0,0 @@ ---- -title: web RBAC db register/assign smoke -description: EnsureSchema path via create_role + assign + can -import web:ext/web/web.mq.md -import json:lib/json.mq.md -import sys:lib/sys.mq.md ---- - -# main - -> print text=rbac-db-start - -**db = > web.db url="sqlite::memory:"** -**url = > json.get value=`db` key="url"** -**rbac = > web.rbac** - -**seed = > `rbac`.create_role url=`db` name="reviewer"** -**ok1 = > json.get value=`seed` key="ok"** -1. `ok1` == True - > print text=create-role-ok -2. * - > print text=create-role-fail - > sys.exit code=1 - -**setp = > `rbac`.set_role_permissions url=`db` role="reviewer" permissions="comments:create,desk:access"** -**ok2 = > json.get value=`setp` key="ok"** -1. `ok2` == True - > print text=set-perms-ok -2. * - > print text=set-perms-fail - > sys.exit code=1 - -**can = > `rbac`.can permissions="comments:create,desk:access" needed="desk:access"** -**allowed = > json.get value=`can` key="allowed"** -1. `allowed` == True - > print text=can-ok -2. * - > print text=can-fail - > sys.exit code=1 - -**deny = > `rbac`.can permissions="comments:create" needed="roles:manage"** -**denied = > json.get value=`deny` key="allowed"** -1. `denied` == False - > print text=can-deny-ok -2. * - > print text=can-deny-fail - > sys.exit code=1 - -> print text=rbac-db-done diff --git a/tests/ext/web-route-smoke.mq.md b/tests/ext/web-route-smoke.mq.md deleted file mode 100644 index e0d7ade..0000000 --- a/tests/ext/web-route-smoke.mq.md +++ /dev/null @@ -1,34 +0,0 @@ ---- -title: web route smoke -description: Offline app.route registration (no listen). -import web:ext/web/web.mq.md -import json:lib/json.mq.md ---- - -# main - -**home = > web.page title="Home" intro="

Home

"** -**about = > web.page title="About" intro="

About

"** -**app = > web.app page=`home` host=127.0.0.1 port=18081** -**app = > `app`.route path="/about" page=`about`** -**app = > `app`.route path="docs" page=`about`** - -**routes = > json.get value=`app` key="routes"** -**about_page = > json.get value=`routes` key="/about"** -**docs_page = > json.get value=`routes` key="/docs"** - -1. `about_page` - > print text=about-ok -2. * - > print text=about-fail - -1. `docs_page` - > print text=docs-ok -2. * - > print text=docs-fail - -**html = > `about`.render** -1. `html` - > print text=render-ok -2. * - > print text=render-fail diff --git a/tests/ext/web-security-smoke.mq.md b/tests/ext/web-security-smoke.mq.md deleted file mode 100644 index 19ce888..0000000 --- a/tests/ext/web-security-smoke.mq.md +++ /dev/null @@ -1,48 +0,0 @@ ---- -title: web security smoke (W3) -description: Password hash ABI + legacy plaintext login (offline). -import web:ext/web/web.mq.md -import plugin:lib/plugin.mq.md -import sys:lib/sys.mq.md ---- - -# main - - - -**p = > plugin.native_path name="web"** -1. `p` - > plugin.load path=`p` -2. * - > sys.exit code=1 - - - -**hash = > web_password_hash password="secret"** -**h = [hash](hash)** -1. `h` != "" - > print text=hash-ok -2. * - > print text=hash-fail - - - -`users` = - -| 行 | 用户 | 密码 | -|----|------|------| -| 1 | admin | secret | - -**login = > web_auth_login username="admin" password="secret" users=`users` session_ttl=120** -**lok = [ok](login)** -1. `lok` - > print text=auth-login-ok -2. * - > print text=auth-login-fail - -**bad = > web_auth_login username="admin" password="wrong" users=`users` session_ttl=120** -**bok = [ok](bad)** -1. `bok` - > print text=auth-bad-should-fail -2. * - > print text=auth-bad-reject-ok diff --git a/tests/ext/web-select-smoke.mq.md b/tests/ext/web-select-smoke.mq.md deleted file mode 100644 index 3e6ccd4..0000000 --- a/tests/ext/web-select-smoke.mq.md +++ /dev/null @@ -1,57 +0,0 @@ ---- -title: web db.select where smoke -description: Offline select with map and filter-table where (no listen). -import web:ext/web/web.mq.md -import articles:web-fixtures/db/articles.mq.md -import json:lib/json.mq.md ---- - -# main - -**store = > web.db url="sqlite:web-fixtures/data/select-smoke.db"** -**schema = > articles.schema** -> `store`.init name=articles fields=`schema` -> `store`.exec sql="DELETE FROM articles" - -`rows` = - -| title | body | -|-------|------| -| Alpha | first | -| Beta | second | -| Alpha again | third | - -> `store`.insert table=articles rows=`rows` - -`eq` = - -| title | body | -|-------|------| -| Alpha | first | - -**hit = > `store`.select table="articles" where=`eq` limit=50** -**n = > len value=`hit`** -1. `n` == 1 - > print text=map-where-ok -2. * - > print text=map-where-fail - -`filt` = - -| 字段 | 操作 | 值 | -|------|------|-----| -| title | like | %Alpha% | - -**like_rows = > `store`.select table="articles" where=`filt` limit=50** -**ln = > len value=`like_rows`** -1. `ln` == 2 - > print text=like-ok -2. * - > print text=like-fail - -**all = > `store`.select table="articles" limit=50** -**an = > len value=`all`** -1. `an` == 3 - > print text=all-ok -2. * - > print text=all-fail diff --git a/tests/ext/web-smoke.mq.md b/tests/ext/web-smoke.mq.md deleted file mode 100644 index ccd7d6c..0000000 --- a/tests/ext/web-smoke.mq.md +++ /dev/null @@ -1,81 +0,0 @@ ---- -title: web assemble smoke -description: Offline assemble + render markers (no listen). -import web:ext/web/web.mq.md -import shell:web-fixtures/styles/shell.mq.md -import nav:web-fixtures/components/nav.mq.md -import side:web-fixtures/components/side.mq.md -import foot:web-fixtures/components/foot.mq.md -import articles:web-fixtures/db/articles.mq.md -import fs:lib/fs.mq.md -import json:lib/json.mq.md ---- - -# main - -**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. * - **seed = > articles.seed** - > `store`.insert table=articles rows=`seed` - -`home` = - -| 组件 | 样式 | -|------|------| -| nav.`nav` | shell.`topnav` | -| side.`side` | shell.`side_panel` | -| foot.`foot` | | - -`index` = - -| 属性 | 值 | 样式 | -|------|-----|------| -| title | articles.`articles`.title | shell.`card_title` | -| body | articles.`articles`.body | shell.`card_body` | - -**page = > web.page title="smoke" intro="

smoke

"** -**page = > `page`.compose_components components=`home`** -**page = > `page`.compose_main main=`index`** -**html = > `page`.render db=`store`** - -1. `html` - > print text=render-ok -2. * - > print text=render-fail - -**nav = > json.get value=`page` key="nav"** -1. `nav` - > print text=compose-nav-ok -2. * - > print text=compose-nav-fail - -**side = > json.get value=`page` key="sidebar"** -1. `side` - > print text=compose-side-ok -2. * - > print text=compose-side-fail - -**css = > json.get value=`page` key="styles_css"** -1. `css` - > print text=styles-ok -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/ext/web-spa-helpers-smoke.mq.md b/tests/ext/web-spa-helpers-smoke.mq.md deleted file mode 100644 index ce2ec0c..0000000 --- a/tests/ext/web-spa-helpers-smoke.mq.md +++ /dev/null @@ -1,34 +0,0 @@ ---- -title: browser spa helpers smoke -description: store_set / spa_goto effect bags -import browser:lib/browser.mq.md -import json:lib/json.mq.md -import sys:lib/sys.mq.md ---- - -# main - -**set = > browser.store_set key="k" value="v" scope="memory"** -**op = > json.get value=`set` key="storage"** -**op_name = > json.get value=`op` key="op"** -**scope = > json.get value=`op` key="scope"** -1. `op_name` == "set" - 1. `scope` == "memory" - > print text=store-set-ok - 2. * - > print text=scope-fail - > sys.exit code=1 -2. * - > print text=op-fail - > sys.exit code=1 - -**nav = > browser.spa_goto url="/item" replace=False** -**n = > json.get value=`nav` key="navigate"** -**url = > json.get value=`n` key="url"** -1. `url` == "/item" - > print text=spa-goto-ok -2. * - > print text=spa-goto-fail - > sys.exit code=1 - -> print text=spa-helpers-ok diff --git a/tests/ext/web-static-artifact-smoke.mq.md b/tests/ext/web-static-artifact-smoke.mq.md new file mode 100644 index 0000000..36e70bf --- /dev/null +++ b/tests/ext/web-static-artifact-smoke.mq.md @@ -0,0 +1,20 @@ +--- +title: web static artifact smoke +import web:ext/web/web.mq.md +--- + +# main + +**pg = > web.page title="static"** +**app = > web.app page=`pg`** +**app = > `app`.static dir="web-fixtures/public" mount="/static"** +**d = [static_dir](app)** +**m = [static_mount](app)** +1. `d` + > print text=dir-ok +2. * + > print text=dir-fail +1. `m` == "/static" + > print text=mount-ok +2. * + > print text=mount-fail diff --git a/tests/ext/web-static-smoke.mq.md b/tests/ext/web-static-smoke.mq.md deleted file mode 100644 index 6ed6f48..0000000 --- a/tests/ext/web-static-smoke.mq.md +++ /dev/null @@ -1,31 +0,0 @@ ---- -title: web static smoke -description: Offline app.static registration (no listen). -import web:ext/web/web.mq.md -import json:lib/json.mq.md ---- - -# main - -**home = > web.page title="Home"** -**app = > web.app page=`home` host=127.0.0.1 port=18081** -**app = > `app`.static dir="web-fixtures/public" mount="/static"** - -**dir = > json.get value=`app` key="static_dir"** -1. `dir` == "web-fixtures/public" - > print text=dir-ok -2. * - > print text=dir-fail - -**mount = > json.get value=`app` key="static_mount"** -1. `mount` == "/static" - > print text=mount-ok -2. * - > print text=mount-fail - -**app2 = > `app`.static dir="assets" mount="/assets"** -**m2 = > json.get value=`app2` key="static_mount"** -1. `m2` == "/assets" - > print text=custom-ok -2. * - > print text=custom-fail diff --git a/tests/ext/web-tenant-bag-smoke.mq.md b/tests/ext/web-tenant-bag-smoke.mq.md deleted file mode 100644 index 6ccd224..0000000 --- a/tests/ext/web-tenant-bag-smoke.mq.md +++ /dev/null @@ -1,30 +0,0 @@ ---- -title: web tenant bag smoke -description: app.tenant mode=path stores config -import web:ext/web/web.mq.md -import json:lib/json.mq.md -import sys:lib/sys.mq.md ---- - -# main - -**首页 = > web.page title="t"** -**应用 = > web.app page=`首页` admin=False** -**应用 = > `应用`.tenant mode="path" param="t" column="tenant_id" default_scope=True** -**bag = > json.get value=`应用` key="tenant"** -**mode = > json.get value=`bag` key="mode"** -**param = > json.get value=`bag` key="param"** -**scope = > json.get value=`bag` key="default_scope"** -1. `mode` == "path" - 1. `param` == "t" - 1. `scope` == True - > print text=tenant-bag-ok - 2. * - > print text=scope-fail - > sys.exit code=1 - 2. * - > print text=param-fail - > sys.exit code=1 -2. * - > print text=mode-fail - > sys.exit code=1 diff --git a/tests/ext/web-upload-live-server.mq.md b/tests/ext/web-upload-live-server.mq.md deleted file mode 100644 index f38a343..0000000 --- a/tests/ext/web-upload-live-server.mq.md +++ /dev/null @@ -1,31 +0,0 @@ ---- -title: web upload live server (W5) -description: Listen with upload + download routes for curl gold. -import web:ext/web/web.mq.md -import plugin:lib/plugin.mq.md -import sys:lib/sys.mq.md ---- - -# main - -**p = > plugin.native_path name="web"** -1. `p` - > plugin.load path=`p` -2. * - > sys.exit code=1 - -**blob = > web.storage url="file:tests/ext/web-fixtures/data/upload-live-blobs"** - -`types` = - -| 类型 | 扩展名 | -|------|--------| -| text/plain | txt | -| image/png | png | - -**pg = > web.page title="upload-live"** -**app = > web.app page=`pg` port=18101** -**app = > `app`.configure body_limit=1048576** -**app = > `app`.upload path="/_upload" field="file" storage=`blob` prefix="live/" max_bytes=1024 types=`types`** -**app = > `app`.download path="/_media/{*key}" storage=`blob` disposition="attachment"** -> `app`.listen diff --git a/tests/ext/web-upload-smoke.mq.md b/tests/ext/web-upload-smoke.mq.md deleted file mode 100644 index 7cbc689..0000000 --- a/tests/ext/web-upload-smoke.mq.md +++ /dev/null @@ -1,77 +0,0 @@ ---- -title: web upload smoke (W5) -description: Offline validate + save into file: storage. -import web:ext/web/web.mq.md -import plugin:lib/plugin.mq.md -import sys:lib/sys.mq.md ---- - -# main - -**p = > plugin.native_path name="web"** -1. `p` - > plugin.load path=`p` -2. * - > sys.exit code=1 - -`types` = - -| 类型 | 扩展名 | -|------|--------| -| image/png | png | -| text/plain | txt | - -**m = > web.media** -**ok = > `m`.validate filename="a.png" content_type="image/png" size=100 max_bytes=1000 types=`types`** -**ook = [ok](ok)** -1. `ook` - > print text=validate-ok -2. * - > print text=validate-fail - -**bad = > `m`.validate filename="a.exe" content_type="application/octet-stream" size=100 max_bytes=1000 types=`types`** -**bok = [ok](bad)** -1. `bok` - > print text=reject-type-fail -2. * - > print text=reject-type-ok - -**big = > `m`.validate filename="a.png" content_type="image/png" size=9000 max_bytes=1000 types=`types`** -**gok = [ok](big)** -1. `gok` - > print text=reject-size-fail -2. * - > print text=reject-size-ok - -**blob = > web.storage url="file:tests/ext/web-fixtures/data/upload-blobs"** -**m = > web.media storage=`blob`** -**saved = > `m`.save path="tests/ext/web-fixtures/upload/sample.txt" content_type="text/plain" prefix="smoke/"** -**sok = [ok](saved)** -**skey = [key](saved)** -1. `sok` - > print text=save-ok -2. * - > print text=save-fail - -**got = > `blob`.get key=`skey`** -**body = [body](got)** -1. `body` == "hello-upload" - > print text=save-roundtrip-ok -2. * - > print text=save-roundtrip-fail - - - -`fields` = - -| name | label | type | -|------|-------|------| -| title | Title | text | -| file | File | file | - -**frm = > web.form table="x" fields=`fields`** -**html = > `frm`.render id="up"** -1. `html` - > print text=form-file-ok -2. * - > print text=form-file-fail diff --git a/tests/ext/web-use-smoke.mq.md b/tests/ext/web-use-smoke.mq.md new file mode 100644 index 0000000..d012850 --- /dev/null +++ b/tests/ext/web-use-smoke.mq.md @@ -0,0 +1,24 @@ +--- +title: web.use middleware smoke +description: First-class middleware via web.use (replaces configure junk drawer). +import web:ext/web/web.mq.md +--- + +# main + +`headers` = + +| header | value | +|--------|-------| +| X-Content-Type-Options | nosniff | +| X-Frame-Options | DENY | + +**pg = > web.page title="use-smoke"** +**app = > web.app page=`pg`** +**app = > web.use app=`app` middleware=`headers`** +**mw = [middleware](app)** +**sec = [security](mw)** +1. `sec` + > print text=use-ok +2. * + > print text=use-fail diff --git a/tests/ext/web-w7-finish-smoke.mq.md b/tests/ext/web-w7-finish-smoke.mq.md deleted file mode 100644 index 6701dd4..0000000 --- a/tests/ext/web-w7-finish-smoke.mq.md +++ /dev/null @@ -1,82 +0,0 @@ ---- -title: web W7 finish smoke — unique index, sitemap, cache-control (offline) -import web:ext/web/web.mq.md -import plugin:lib/plugin.mq.md -import sys:lib/sys.mq.md ---- - -# main - -**p = > plugin.native_path name="web"** -1. `p` - > plugin.load path=`p` -2. * - > sys.exit code=1 - -**store = > web.db url="sqlite:web-fixtures/data/w7-smoke.db"** -> `store`.exec sql="DROP TABLE IF EXISTS posts" - -`fields` = - -| 字段 | 类型 | 可空 | 唯一 | 索引 | -|------|------|------|------|------| -| id | int | 否 | | | -| slug | text | 否 | 是 | 是 | -| title | text | 否 | | | - -> `store`.init name=posts fields=`fields` - -**idx = > `store`.query sql="SELECT name FROM sqlite_master WHERE type='index' AND tbl_name='posts'"** -**nidx = > len value=[rows](idx)** -1. `nidx` >= 1 - > print text=unique-ok -2. * - > print text=unique-fail - -`items` = - -| loc | 更新 | -|-----|------| -| / | 2026-08-28 | -| /about | 2026-08-28 | - -**sm = > web_sitemap_build base="https://example.com" items=`items`** -**xml = [xml](sm)** -1. `xml` - > print text=sitemap-ok -2. * - > print text=sitemap-fail - -**pg = > web.page title="w7"** -**notfound = > web.page title="Missing"** -**app = > web.app page=`pg` port=18120** -**app = > `app`.configure cache_control="public, max-age=60" access_log=False** -**app = > `app`.redirect from="/old" to="/new" permanent=True** -**app = > `app`.error_page status=404 page=`notfound`** -**app = > `app`.sitemap path="/sitemap.xml" base="https://example.com" items=`items`** -**app = > `app`.robots sitemap="https://example.com/sitemap.xml"** -**rd = [redirects](app)** -**has = [/old](rd)** -1. `has` - > print text=redirect-ok -2. * - > print text=redirect-fail - -**rb = [robots_body](app)** -1. `rb` - > print text=robots-ok -2. * - > print text=robots-fail - -**mw = [middleware](app)** -**cc = [cache_control](mw)** -1. `cc` == "public, max-age=60" - > print text=cache-control-ok -2. * - > print text=cache-control-fail - -**p404 = [page_404](app)** -1. `p404` - > print text=error-page-ok -2. * - > print text=error-page-fail diff --git a/tests/ext/web-w7-live-server.mq.md b/tests/ext/web-w7-live-server.mq.md deleted file mode 100644 index 0198a99..0000000 --- a/tests/ext/web-w7-live-server.mq.md +++ /dev/null @@ -1,31 +0,0 @@ ---- -title: web W7 live server — 404, redirect, sitemap, robots, cache-control -import web:ext/web/web.mq.md -import plugin:lib/plugin.mq.md -import sys:lib/sys.mq.md ---- - -# main - -**p = > plugin.native_path name="web"** -1. `p` - > plugin.load path=`p` -2. * - > sys.exit code=1 - -`items` = - -| loc | note | -|-----|------| -| / | home | -| /about | about | - -**pg = > web.page title="w7-live"** -**nf = > web.page title="Not Found Page"** -**app = > web.app page=`pg` port=18121** -**app = > `app`.configure cache_control="public, max-age=120"** -**app = > `app`.redirect from="/legacy" to="/" permanent=True** -**app = > `app`.error_page status=404 page=`nf`** -**app = > `app`.sitemap path="/sitemap.xml" base="http://127.0.0.1:18121" items=`items`** -**app = > `app`.robots sitemap="http://127.0.0.1:18121/sitemap.xml"** -> `app`.listen diff --git a/tests/ext/web-ws-broadcast-live-server.mq.md b/tests/ext/web-ws-broadcast-live-server.mq.md deleted file mode 100644 index 8dddc29..0000000 --- a/tests/ext/web-ws-broadcast-live-server.mq.md +++ /dev/null @@ -1,20 +0,0 @@ ---- -title: web ws broadcast live server -import web:ext/web/web.mq.md -import plugin:lib/plugin.mq.md -import sys:lib/sys.mq.md ---- - -# main - -**p = > plugin.native_path name="web"** -1. `p` - > plugin.load path=`p` -2. * - > sys.exit code=1 - -**pg = > web.page title="ws-live"** -**app = > web.app page=`pg` port=18112** -**app = > `app`.configure access_log=True** -**app = > `app`.route_ws path="/room" mode="broadcast" require_auth=False** -> `app`.listen diff --git a/tests/ext/web-ws-broadcast-smoke.mq.md b/tests/ext/web-ws-broadcast-smoke.mq.md deleted file mode 100644 index 5e5b1af..0000000 --- a/tests/ext/web-ws-broadcast-smoke.mq.md +++ /dev/null @@ -1,33 +0,0 @@ ---- -title: web ws broadcast + access_log smoke (offline) -import web:ext/web/web.mq.md -import plugin:lib/plugin.mq.md -import sys:lib/sys.mq.md ---- - -# main - -**p = > plugin.native_path name="web"** -1. `p` - > plugin.load path=`p` -2. * - > sys.exit code=1 - -**pg = > web.page title="w6b"** -**app = > web.app page=`pg` port=18111** -**app = > `app`.route_ws path="/room" mode="broadcast"** -**routes = [ws_routes](app)** -**room = [/room](routes)** -**mode = [mode](room)** -1. `mode` == "broadcast" - > print text=ws-broadcast-route-ok -2. * - > print text=ws-broadcast-route-fail - -**app = > `app`.configure access_log=True compress=False** -**mw = [middleware](app)** -**al = [access_log](mw)** -1. `al` - > print text=access-log-ok -2. * - > print text=access-log-fail diff --git a/tests/ext/web-ws-room-bag-smoke.mq.md b/tests/ext/web-ws-room-bag-smoke.mq.md deleted file mode 100644 index a669ae0..0000000 --- a/tests/ext/web-ws-room-bag-smoke.mq.md +++ /dev/null @@ -1,36 +0,0 @@ ---- -title: web WS room + on_message bag smoke -description: route_ws mode=room stores room_key, on_message, presence -import web:ext/web/web.mq.md -import json:lib/json.mq.md -import sys:lib/sys.mq.md ---- - -# main - -**首页 = > web.page title="ws"** -**应用 = > web.app page=`首页` admin=False** -**应用 = > `应用`.route_ws path="/chat/{id}" mode="room" room_key="chat.room.{id}" on_message="chat.persist" presence=True** -**routes = > json.get value=`应用` key="ws_routes"** -**spec = > json.get value=`routes` key="/chat/{id}"** -**mode = > json.get value=`spec` key="mode"** -**rk = > json.get value=`spec` key="room_key"** -**om = > json.get value=`spec` key="on_message"** -**pr = > json.get value=`spec` key="presence"** -1. `mode` == "room" - 1. `rk` == "chat.room.{id}" - 1. `om` == "chat.persist" - 1. `pr` == True - > print text=ws-room-bag-ok - 2. * - > print text=presence-fail - > sys.exit code=1 - 2. * - > print text=on-message-fail - > sys.exit code=1 - 2. * - > print text=room-key-fail - > sys.exit code=1 -2. * - > print text=mode-fail - > sys.exit code=1 diff --git a/tests/ext/web-zh-smoke.mq.md b/tests/ext/web-zh-smoke.mq.md deleted file mode 100644 index 08ffb63..0000000 --- a/tests/ext/web-zh-smoke.mq.md +++ /dev/null @@ -1,82 +0,0 @@ ---- -title: web zh API smoke -description: Offline Chinese 网页.mq.md assemble (no listen). -导入 网页:ext/web/网页.mq.md -import nav:web-fixtures/components/nav.mq.md -import side:web-fixtures/components/side.mq.md -import foot:web-fixtures/components/foot.mq.md -import articles:web-fixtures/db/articles.mq.md -import json:lib/json.mq.md ---- - -# main - -**store = > 网页.数据库 地址="sqlite:web-fixtures/data/zh-smoke.db"** -**schema = > articles.schema** -> `store`.初始化 名=articles 字段=`schema` -> `store`.执行 sql="DELETE FROM articles" -> `store`.执行 sql="DELETE FROM sqlite_sequence WHERE name='articles'" - -`layout` = - -| 组件 | 样式 | -|------|------| -| nav.`nav` | | -| side.`side` | | -| foot.`foot` | | - -`index` = - -| 属性 | 值 | 样式 | -|------|-----|------| -| title | articles.`articles`.title | | -| body | articles.`articles`.body | | - -`seed` = - -| title | body | -|-------|------| -| 中文种子 | 正文 | - -> `store`.插入 表=articles 行=`seed` - -**page = > 网页.页面 标题="中文烟测" 引言="

中文

"** -**page = > `page`.组件装配 组件=`layout`** -**page = > `page`.主体装配 主体=`index`** - -**html = > `page`.渲染 数据库=`store`** -1. `html` - > print text=render-ok -2. * - > print text=render-fail - -**nav = > json.get value=`page` key="nav"** -1. `nav` - > print text=compose-ok -2. * - > print text=compose-fail - -`fields` = - -| 字段 | 标签 | 类型 | 必填 | 默认 | -|------|------|------|------|------| -| title | 标题 | text | true | | - -**f = > 网页.表单 表="articles" 动作="插入"** -**f = > `f`.字段 字段=`fields`** -**page = > `page`.表单装配 id="article" 表单=`f`** -**fid = > json.get value=`page` key="form_id"** -1. `fid` == "article" - > print text=form-ok -2. * - > print text=form-fail - -**app = > 网页.应用 页面=`page` 数据库=`store` 主机=127.0.0.1 端口=18082** -**about = > 网页.页面 标题="关于" 引言="

关于

"** -**app = > `app`.路由 路径="/about" 页面=`about`** -**routes = > json.get value=`app` key="routes"** -**routed = > json.get value=`routes` key="/about"** -1. `routed` - > print text=route-ok -2. * - > print text=route-fail diff --git a/tests/gold.rs b/tests/gold.rs index 1d914cf..c2f5d34 100644 --- a/tests/gold.rs +++ b/tests/gold.rs @@ -1829,732 +1829,94 @@ fn ext_web_data_db_smoke() { } #[test] -#[ignore = "ADR 0007 web artifact rewrite — see ext_web_artifact_*"] -fn ext_web_smoke() { +fn ext_web_use_smoke() { + ensure_web_plugin_built(); + assert_out("tests/ext/web-use-smoke.mq.md", "use-ok"); +} + +#[test] +fn ext_web_static_artifact_smoke() { ensure_web_plugin_built(); assert_out( - "tests/ext/web-smoke.mq.md", - "render-ok -compose-nav-ok -compose-side-ok -styles-ok -compose-ok -db-ok", - ); -} - -#[test] -#[ignore = "ADR 0007 web artifact rewrite — see ext_web_artifact_*"] -fn ext_web_entrydir_smoke() { - // Relative db paths must resolve against the *entry script* directory, - // not the process cwd (host_query("entry_dir")). We run from the repo - // root while the script lives in tests/ext, so the sqlite file must - // land under tests/ext/entrydir-fixtures/data/ and NOT repo-root/. - ensure_web_plugin_built(); - - let script = "tests/ext/web-entrydir-smoke.mq.md"; - let fixture_data = std::path::Path::new("tests/ext/entrydir-fixtures/data"); - let db_path = fixture_data.join("entrydir.db"); - let _ = std::fs::remove_dir_all(fixture_data); - let stale_root = std::path::Path::new("entrydir-fixtures"); - let _ = std::fs::remove_dir_all(stale_root); - - // cwd = repo root (CARGO_MANIFEST_DIR), script in tests/ext. - let output = Command::new(env!("CARGO_BIN_EXE_marqdo")) - .args(["run", script]) - .current_dir(env!("CARGO_MANIFEST_DIR")) - .output() - .expect("run web-entrydir-smoke"); - let code = output.status.code().unwrap_or(1); - let stdout = String::from_utf8_lossy(&output.stdout); - let stderr = String::from_utf8_lossy(&output.stderr); - assert_eq!(code, 0, "{script} stderr={stderr}"); - assert!( - stdout.contains("entrydir-db-ok"), - "{script} stdout={stdout}" - ); - assert!( - db_path.is_file(), - "expected db at {} (script dir), stdout={stdout} stderr={stderr}", - db_path.display() - ); - assert!( - !stale_root.exists(), - "db must not resolve against cwd (repo root): {} exists", - stale_root.display() - ); -} - -#[test] -#[ignore = "ADR 0007 web artifact rewrite — see ext_web_artifact_*"] -fn ext_web_form_smoke() { - ensure_web_plugin_built(); - assert_out( - "tests/ext/web-form-smoke.mq.md", - "validate-ok -submit-ok -db-ok -render-ok", - ); -} - -#[test] -#[ignore = "ADR 0007 web artifact rewrite — see ext_web_artifact_*"] -fn ext_web_admin_smoke() { - ensure_web_plugin_built(); - assert_out( - "tests/ext/web-admin-smoke.mq.md", - "schema-ok -new-form-ok -insert-ok -get-ok -update-ok -edit-ok -required-ok -errors-echoed-ok", - ); -} - -#[test] -#[ignore = "ADR 0007 web artifact rewrite — see ext_web_artifact_*"] -fn ext_web_net_smoke() { - ensure_web_plugin_built(); - assert_out( - "tests/ext/web-net-smoke.mq.md", - "session-new-ok -session-set-ok -session-get-ok -session-del-ok -session-del-confirm -auth-login-ok -auth-check-ok -auth-bad-ok -auth-zh-ok -auth-logout-ok -auth-logout-confirm -ws-route-ok -app-auth-ok -ext-auth-ok -ws-connect-error-ok", - ); -} - -#[test] -#[ignore = "ADR 0007 web artifact rewrite — see ext_web_artifact_*"] -fn ext_web_route_smoke() { - ensure_web_plugin_built(); - assert_out( - "tests/ext/web-route-smoke.mq.md", - "about-ok -docs-ok -render-ok", - ); -} - -#[test] -#[ignore = "ADR 0007 web artifact rewrite — see ext_web_artifact_*"] -fn ext_web_form_embed_smoke() { - ensure_web_plugin_built(); - assert_out( - "tests/ext/web-form-embed-smoke.mq.md", - "form-id-ok -render-ok", - ); -} - -#[test] -#[ignore = "ADR 0007 web artifact rewrite — see ext_web_artifact_*"] -fn ext_web_form_slot_smoke() { - ensure_web_plugin_built(); - assert_out( - "tests/ext/web-form-slot-smoke.mq.md", - "target-ok -slot-ok", - ); -} - -#[test] -#[ignore = "ADR 0007 web artifact rewrite — see ext_web_artifact_*"] -fn ext_web_form_source_live() { - // Field sources: only body is client-editable; author/slug stamped from session/route. - ensure_web_plugin_built(); - - let script = "tests/ext/web-form-source-live-server.mq.md"; - let bin = env!("CARGO_BIN_EXE_marqdo"); - let mut child = Command::new(bin) - .args(["run", script]) - .current_dir(env!("CARGO_MANIFEST_DIR")) - .stdout(Stdio::piped()) - .stderr(Stdio::piped()) - .spawn() - .expect("spawn form-source live server"); - - let base = "http://127.0.0.1:18117"; - let ready = std::time::Instant::now(); - loop { - if ready.elapsed().as_secs() > 15 { - let _ = child.kill(); - panic!("form-source live server did not start in time"); - } - let out = Command::new("curl") - .args([ - "-s", - "-o", - "/dev/null", - "-w", - "%{http_code}", - &format!("{base}/post/hello"), - ]) - .output() - .expect("curl probe"); - if String::from_utf8_lossy(&out.stdout) == "200" { - break; - } - std::thread::sleep(std::time::Duration::from_millis(300)); - } - - let page = Command::new("curl") - .args(["-s", &format!("{base}/post/hello")]) - .output() - .expect("curl post page"); - let html = String::from_utf8_lossy(&page.stdout); - assert!( - html.contains(r#"name="body""#), - "body field missing: {html}" - ); - assert!( - !html.contains(r#"name="author""#), - "author must not render (server-only): {html}" - ); - assert!( - !html.contains(r#"name="post_slug""#), - "post_slug must not render (server-only): {html}" - ); - assert!( - html.contains("_mq_params") && html.contains("hello"), - "expected _mq_params with slug: {html}" - ); - - let jar = std::env::temp_dir().join("marqdo-form-source-cookies.txt"); - let _ = std::fs::remove_file(&jar); - let login = Command::new("curl") - .args([ - "-s", - "-c", - jar.to_str().unwrap(), - "-b", - jar.to_str().unwrap(), - "-o", - "/dev/null", - "-w", - "%{http_code}", - "-X", - "POST", - &format!("{base}/login"), - "-d", - "username=alice&password=secret", - ]) - .output() - .expect("curl login"); - let login_code = String::from_utf8_lossy(&login.stdout); - assert!( - login_code == "303" || login_code == "302" || login_code == "200", - "login http_code={login_code}" - ); - - let post = Command::new("curl") - .args([ - "-s", - "-c", - jar.to_str().unwrap(), - "-b", - jar.to_str().unwrap(), - "-o", - "/dev/null", - "-w", - "%{http_code}", - "-X", - "POST", - &format!("{base}/_form/comment"), - "--data-urlencode", - "body=gold comment", - "--data-urlencode", - "author=forged-attacker", - "--data-urlencode", - "post_slug=evil-slug", - "--data-urlencode", - r#"_mq_params={"slug":"hello"}"#, - "--data-urlencode", - "_mq_return=/post/hello", - ]) - .output() - .expect("curl form post"); - let post_code = String::from_utf8_lossy(&post.stdout); - assert!( - post_code == "303" || post_code == "302", - "form post http_code={post_code}" - ); - - let api = Command::new("curl") - .args(["-s", &format!("{base}/api/comments")]) - .output() - .expect("curl comments api"); - let body = String::from_utf8_lossy(&api.stdout); - assert!( - body.contains("\"author\":\"alice\"") && body.contains("gold comment"), - "author must be session user, not forged: {body}" - ); - assert!( - body.contains("\"post_slug\":\"hello\""), - "post_slug must be route param, not forged: {body}" - ); - assert!( - !body.contains("forged-attacker") && !body.contains("evil-slug"), - "forged values must not persist: {body}" - ); - - let _ = child.kill(); - let _ = child.wait(); - let _ = std::fs::remove_file(&jar); -} - -#[test] -#[ignore = "ADR 0007 web artifact rewrite — see ext_web_artifact_*"] -fn ext_web_part_smoke() { - ensure_web_plugin_built(); - assert_out( - "tests/ext/web-part-smoke.mq.md", - "route-stamp-ok -home-part-ok -route-part-ok", - ); -} - -#[test] -#[ignore = "ADR 0007 web artifact rewrite — see ext_web_artifact_*"] -fn ext_web_select_smoke() { - ensure_web_plugin_built(); - assert_out( - "tests/ext/web-select-smoke.mq.md", - "map-where-ok -like-ok -all-ok", - ); -} - -#[test] -#[ignore = "ADR 0007 web artifact rewrite — see ext_web_artifact_*"] -fn ext_web_zh_smoke() { - ensure_web_plugin_built(); - assert_out( - "tests/ext/web-zh-smoke.mq.md", - "render-ok -compose-ok -form-ok -route-ok", - ); -} - -#[test] -#[ignore = "ADR 0007 web artifact rewrite — see ext_web_artifact_*"] -fn ext_web_static_smoke() { - ensure_web_plugin_built(); - assert_out( - "tests/ext/web-static-smoke.mq.md", + "tests/ext/web-static-artifact-smoke.mq.md", "dir-ok -mount-ok -custom-ok", +mount-ok", ); } #[test] -#[ignore = "ADR 0007 web artifact rewrite — see ext_web_artifact_*"] -fn ext_web_assets_smoke() { +fn ext_web_rbac_artifact_smoke() { ensure_web_plugin_built(); - assert_out( - "tests/ext/web-assets-smoke.mq.md", - "images-ok -head-ok -meta-icon-ok -icons-ok -site-head-ok -make-images-ok -make-head-ok", - ); + assert_out("tests/ext/web-rbac-artifact-smoke.mq.md", "rbac-ok"); } #[test] -#[ignore = "ADR 0007 web artifact rewrite — see ext_web_artifact_*"] -fn ext_web_assets_live() { +fn ext_web_cache_artifact_smoke() { ensure_web_plugin_built(); + assert_out("tests/ext/web-cache-artifact-smoke.mq.md", "cache-ok"); +} - let script = "tests/ext/web-assets-live-server.mq.md"; +#[test] +fn ext_web_artifact_endpoint_live() { + ensure_web_plugin_built(); let bin = env!("CARGO_BIN_EXE_marqdo"); + let root = std::path::PathBuf::from(env!("CARGO_MANIFEST_DIR")); + let site = root.join("tests/ext/web-artifact-site"); let mut child = Command::new(bin) - .args(["run", script]) - .current_dir(env!("CARGO_MANIFEST_DIR")) - .stdout(Stdio::piped()) - .stderr(Stdio::piped()) + .args(["run", "serve.mq.md"]) + .current_dir(&site) + .stdout(Stdio::null()) + .stderr(Stdio::null()) .spawn() - .expect("spawn assets live server"); - - let base = "http://127.0.0.1:18092"; - let ready = std::time::Instant::now(); - loop { - if ready.elapsed().as_secs() > 10 { - let _ = child.kill(); - panic!("assets live server did not start in time"); - } - let out = Command::new("curl") - .args([ - "-s", - "-o", - "/dev/null", - "-w", - "%{http_code}", - &format!("{base}/"), - ]) - .output() - .expect("curl probe"); - if String::from_utf8_lossy(&out.stdout) == "200" { - break; - } - std::thread::sleep(std::time::Duration::from_millis(300)); - } - - let out = Command::new("curl") - .args([ - "-s", - "-D", - "-", - "-o", - "/tmp/marqdo-favicon.bin", - "-w", - "\n%{http_code}", - &format!("{base}/favicon.ico"), - ]) - .output() - .expect("curl favicon"); - let body = String::from_utf8_lossy(&out.stdout); - assert!( - body.contains("200") && body.to_ascii_lowercase().contains("image/"), - "favicon headers={body}" - ); - - let out = Command::new("curl") - .args(["-s", &format!("{base}/")]) - .output() - .expect("curl home"); - let html = String::from_utf8_lossy(&out.stdout); - assert!( - html.contains("rel=\"icon\"") && html.contains("mq-images") && html.contains("apple-touch-icon"), - "home html missing assets markers: {}", - &html[..html.len().min(500)] - ); - - let _ = child.kill(); -} - -#[test] -#[ignore = "ADR 0007 web artifact rewrite — see ext_web_artifact_*"] -fn ext_web_middleware_smoke() { - ensure_web_plugin_built(); - assert_out( - "tests/ext/web-middleware-smoke.mq.md", - "cors-origin-ok -cors-method-ok -cors-expose-ok -cors-cred-ok -security-frame-ok -security-csp-ok -compress-ok -body-limit-ok -json-get-ok -json-table-ok -json-order-ok -json-limit-ok -json-post-ok", - ); -} - -#[test] -#[ignore = "ADR 0007 web artifact rewrite — see ext_web_artifact_*"] -fn ext_web_middleware_live() { - // Boots a real HTTP server and verifies CORS / security headers / - // gzip / JSON API / body limit over the wire. - ensure_web_plugin_built(); - - let script = "tests/ext/web-middleware-live-server.mq.md"; - let bin = env!("CARGO_BIN_EXE_marqdo"); - let mut child = Command::new(bin) - .args(["run", script]) - .current_dir(env!("CARGO_MANIFEST_DIR")) - .stdout(Stdio::piped()) - .stderr(Stdio::piped()) - .spawn() - .expect("spawn live server"); - - // Wait for the listener to accept connections (up to ~10s). - let base = "http://127.0.0.1:18099"; - let ready = std::time::Instant::now(); - loop { - if ready.elapsed().as_secs() > 10 { - let _ = child.kill(); - panic!("live server did not start in time"); - } - let out = Command::new("curl") - .args(["-s", "-o", "/dev/null", "-w", "%{http_code}", &format!("{base}/")]) - .output() - .expect("curl probe"); - if String::from_utf8_lossy(&out.stdout) == "200" { - break; - } - std::thread::sleep(std::time::Duration::from_millis(300)); - } - - let code = |args: &[&str]| { - Command::new("curl") - .args(args) - .output() - .expect("curl") - }; - - // JSON API: rows are served as application/json. - let out = code(&["-s", &format!("{base}/api/posts")]); - let body = String::from_utf8_lossy(&out.stdout); - assert!( - body.contains("\"title\":\"Hello\"") && body.contains("\"rows\""), - "json api body={body}" - ); - - // CORS on the JSON endpoint (matching origin → allow headers). - // Compare case-insensitively: Go net/http canonicalizes header names. - let header_has = |headers: &str, needle: &str| -> bool { - headers.to_ascii_lowercase().contains(&needle.to_ascii_lowercase()) - }; - let out = code(&[ - "-s", "-D", "-", "-o", "/dev/null", &format!("{base}/api/posts"), - "-H", "Origin: https://a.example", - ]); - let headers = String::from_utf8_lossy(&out.stdout); - assert!( - header_has(&headers, "access-control-allow-origin: https://a.example"), - "cors allow-origin headers={headers}" - ); - assert!( - header_has(&headers, "access-control-allow-credentials: true"), - "cors credentials headers={headers}" - ); - assert!( - header_has(&headers, "access-control-expose-headers: x-total"), - "cors expose headers={headers}" - ); - - // OPTIONS preflight. - let out = code(&[ - "-s", "-D", "-", "-o", "/dev/null", "-X", "OPTIONS", - &format!("{base}/api/posts"), - "-H", "Origin: https://a.example", - "-H", "Access-Control-Request-Method: GET", - ]); - let headers = String::from_utf8_lossy(&out.stdout); - assert!( - header_has(&headers, "access-control-allow-methods: GET"), - "cors preflight headers={headers}" - ); - assert!( - header_has(&headers, "access-control-allow-origin"), - "cors preflight origin headers={headers}" - ); - - // Security response headers on a page render. - let out = code(&["-s", "-D", "-", "-o", "/dev/null", &format!("{base}/")]); - let headers = String::from_utf8_lossy(&out.stdout); - assert!( - header_has(&headers, "x-frame-options: DENY"), - "security headers={headers}" - ); - assert!( - header_has(&headers, "x-content-type-options: nosniff"), - "security headers={headers}" - ); - - // gzip compression. - let out = code(&[ - "-s", "-D", "-", "-o", "/dev/null", &format!("{base}/api/posts"), - "-H", "Accept-Encoding: gzip", - ]); - let headers = String::from_utf8_lossy(&out.stdout); - assert!( - header_has(&headers, "content-encoding: gzip"), - "gzip headers={headers}" - ); - - // Body limit: small POST ok, large POST → 413. - let out = code(&[ - "-s", "-o", "/dev/null", "-w", "%{http_code}", "-X", "POST", - &format!("{base}/api/publish"), "-H", "Content-Type: application/json", - "-d", r#"{"title":"t1","body":"b1"}"#, - ]); - assert_eq!( - String::from_utf8_lossy(&out.stdout).trim(), - "200", - "small POST should pass body limit" - ); - let big = "x".repeat(2000); - let out = code(&[ - "-s", "-o", "/dev/null", "-w", "%{http_code}", "-X", "POST", - &format!("{base}/api/publish"), "-H", "Content-Type: application/json", - "-d", &big, - ]); - assert_eq!( - String::from_utf8_lossy(&out.stdout).trim(), - "413", - "large POST should exceed body limit" - ); - - let _ = child.kill(); - let _ = child.wait(); -} - -#[test] -#[ignore = "ADR 0007 web artifact rewrite — see ext_web_artifact_*"] -fn ext_web_proxy_invoke_smoke() { - ensure_web_plugin_built(); - assert_out( - "tests/ext/web-proxy-invoke-smoke.mq.md", - "proxy-table-ok -proxy-stream-ok -proxy-env-ok -proxy-method-ok -invoke-table-ok -invoke-method-ok", - ); -} - -#[test] -#[ignore = "ADR 0007 web artifact rewrite — see ext_web_artifact_*"] -fn ext_web_hosting_live() { - // Mock upstream SSE on 18142 + Marqdo web proxy/invoke on 18141. - ensure_web_plugin_built(); - - use std::io::{Read, Write}; - use std::net::TcpListener; - - let upstream = TcpListener::bind("127.0.0.1:18142").expect("bind mock upstream"); - upstream.set_nonblocking(true).ok(); - let upstream_thread = std::thread::spawn(move || { - let deadline = std::time::Instant::now() + std::time::Duration::from_secs(20); - loop { - if std::time::Instant::now() > deadline { - break; - } - match upstream.accept() { - Ok((mut sock, _)) => { - let mut buf = [0u8; 4096]; - let _ = sock.set_read_timeout(Some(std::time::Duration::from_secs(2))); - let _ = sock.read(&mut buf); - let body = "data: {\"id\":1}\n\ndata: {\"id\":2}\n\n"; - let resp = format!( - "HTTP/1.1 200 OK\r\nContent-Type: text/event-stream\r\nContent-Length: {}\r\nConnection: close\r\n\r\n{}", - body.len(), - body - ); - let _ = sock.write_all(resp.as_bytes()); - let _ = sock.flush(); - } - Err(ref e) if e.kind() == std::io::ErrorKind::WouldBlock => { - std::thread::sleep(std::time::Duration::from_millis(50)); - } - Err(_) => break, - } - } - }); - - let script = "tests/ext/web-hosting-live-server.mq.md"; - let bin = env!("CARGO_BIN_EXE_marqdo"); - let mut child = Command::new(bin) - .args(["run", script]) - .current_dir(env!("CARGO_MANIFEST_DIR")) - .stdout(Stdio::piped()) - .stderr(Stdio::piped()) - .spawn() - .expect("spawn hosting live server"); - - let base = "http://127.0.0.1:18141"; + .expect("spawn artifact site"); + let base = "http://127.0.0.1:18110"; let ready = std::time::Instant::now(); loop { if ready.elapsed().as_secs() > 15 { let _ = child.kill(); - panic!("hosting live server did not start in time"); + panic!("artifact site did not start"); } let out = Command::new("curl") .args(["-s", "-o", "/dev/null", "-w", "%{http_code}", &format!("{base}/")]) .output() - .expect("curl probe"); + .expect("curl"); if String::from_utf8_lossy(&out.stdout) == "200" { break; } - std::thread::sleep(std::time::Duration::from_millis(300)); + std::thread::sleep(std::time::Duration::from_millis(200)); } - - // Proxy SSE: expect both data frames. - let out = Command::new("curl") - .args([ - "-s", - "-N", - "-X", - "POST", - &format!("{base}/proxy/sse"), - "-H", - "Content-Type: application/json", - "-d", - "{}", - ]) - .output() - .expect("curl proxy"); - let body = String::from_utf8_lossy(&out.stdout); + let about = Command::new("curl").args(["-s", &format!("{base}/about")]).output().unwrap(); + let about_s = String::from_utf8_lossy(&about.stdout); + assert!(about_s.contains("About"), "about={about_s}"); + let ping = Command::new("curl").args(["-s", &format!("{base}/api/ping")]).output().unwrap(); + let ping_s = String::from_utf8_lossy(&ping.stdout); assert!( - body.contains("data: {\"id\":1}") && body.contains("data: {\"id\":2}"), - "proxy sse body={body}" + ping_s.contains("pong") || ping_s.contains("\"ok\""), + "ping={ping_s}" ); - - // Invoke twice: demo.echo nests a web.page plugin call; the second request - // must still see GLOBAL_HOST (listen outer frame) — regression for 0.3.7. - for (msg, label) in [("hi", "first"), ("again", "second")] { - let out = Command::new("curl") - .args([ - "-s", - "-X", - "POST", - &format!("{base}/api/echo"), - "-H", - "Content-Type: application/json", - "-d", - &format!(r#"{{"msg":"{msg}"}}"#), - ]) - .output() - .expect("curl invoke"); - let body = String::from_utf8_lossy(&out.stdout); - assert!( - body.contains("\"ok\"") - && body.contains(&format!("\"msg\":\"{msg}\"")) - && !body.contains("no active host context"), - "invoke {label} body={body}" - ); - } - let _ = child.kill(); - let _ = child.wait(); - let _ = upstream_thread.join(); } -#[test] -#[ignore = "ADR 0007 web artifact rewrite — see ext_web_artifact_*"] -fn ext_web_db_cross_module_smoke() { - ensure_web_plugin_built(); - assert_out("tests/ext/web-db-cross-module-smoke.mq.md", "cross-db-ok"); -} + + + + + + + + + + + + + + + + + + + + #[test] fn ext_agent_mcp_server_smoke() { @@ -2604,609 +1966,18 @@ jev-alias-ok", ); } -#[test] -#[ignore = "ADR 0007 web artifact rewrite — see ext_web_artifact_*"] -fn ext_web_security_smoke() { - ensure_web_plugin_built(); - assert_out( - "tests/ext/web-security-smoke.mq.md", - "hash-ok -auth-login-ok -auth-bad-reject-ok", - ); -} -#[test] -#[ignore = "ADR 0007 web artifact rewrite — see ext_web_artifact_*"] -fn ext_web_content_smoke() { - ensure_web_plugin_built(); - assert_out( - "tests/ext/web-content-smoke.mq.md", - "meta-ok -paginate-ok -rss-ok", - ); -} -#[test] -#[ignore = "ADR 0007 web artifact rewrite — see ext_web_artifact_*"] -fn ext_web_drivers_smoke() { - // W4 drivers: memory cache, file storage, postgres/s3 URL shape (offline). - ensure_web_plugin_built(); - let root = std::path::PathBuf::from(env!("CARGO_MANIFEST_DIR")) - .join("tests/ext/web-fixtures/data/drivers-blobs"); - let _ = std::fs::remove_dir_all(&root); - assert_out( - "tests/ext/web-drivers-smoke.mq.md", - "cache-ok -cache-del-ok -storage-ok -storage-list-ok -postgres-url-ok -s3-open-ok", - ); -} -#[test] -#[ignore = "ADR 0007 web artifact rewrite — see ext_web_artifact_*"] -fn ext_web_upload_smoke() { - ensure_web_plugin_built(); - let root = std::path::PathBuf::from(env!("CARGO_MANIFEST_DIR")) - .join("tests/ext/web-fixtures/data/upload-blobs"); - let _ = std::fs::remove_dir_all(&root); - assert_out( - "tests/ext/web-upload-smoke.mq.md", - "validate-ok -reject-type-ok -reject-size-ok -save-ok -save-roundtrip-ok -form-file-ok", - ); -} -#[test] -#[ignore = "ADR 0007 web artifact rewrite — see ext_web_artifact_*"] -fn ext_web_upload_live() { - ensure_web_plugin_built(); - let root = std::path::PathBuf::from(env!("CARGO_MANIFEST_DIR")) - .join("tests/ext/web-fixtures/data/upload-live-blobs"); - let _ = std::fs::remove_dir_all(&root); - let script = "tests/ext/web-upload-live-server.mq.md"; - let bin = env!("CARGO_BIN_EXE_marqdo"); - let mut child = Command::new(bin) - .args(["run", script]) - .current_dir(env!("CARGO_MANIFEST_DIR")) - .stdout(Stdio::piped()) - .stderr(Stdio::piped()) - .spawn() - .expect("spawn upload live server"); - let base = "http://127.0.0.1:18101"; - let ready = std::time::Instant::now(); - loop { - if ready.elapsed().as_secs() > 10 { - let _ = child.kill(); - panic!("upload live server did not start in time"); - } - let out = Command::new("curl") - .args([ - "-s", - "-o", - "/dev/null", - "-w", - "%{http_code}", - &format!("{base}/"), - ]) - .output() - .expect("curl probe"); - if String::from_utf8_lossy(&out.stdout) == "200" { - break; - } - std::thread::sleep(std::time::Duration::from_millis(300)); - } - let fixture = std::path::PathBuf::from(env!("CARGO_MANIFEST_DIR")) - .join("tests/ext/web-fixtures/upload/sample.txt"); - - // Happy path multipart upload. - let out = Command::new("curl") - .args([ - "-s", - "-w", - "\n%{http_code}", - "-F", - &format!("file=@{};type=text/plain", fixture.display()), - &format!("{base}/_upload"), - ]) - .output() - .expect("curl upload"); - let body = String::from_utf8_lossy(&out.stdout); - let (json_part, code) = body.rsplit_once('\n').unwrap_or((&body, "")); - assert_eq!(code.trim(), "200", "upload body={body}"); - assert!( - json_part.contains("\"ok\":true") && json_part.contains("\"key\""), - "upload json={json_part}" - ); - let key = { - let v: serde_json::Value = - serde_json::from_str(json_part).expect("upload json parse"); - v.get("key") - .and_then(|k| k.as_str()) - .expect("key") - .to_string() - }; - - // Download with Content-Disposition. - let out = Command::new("curl") - .args([ - "-s", - "-D", - "-", - "-o", - "/tmp/marqdo-upload-dl.txt", - &format!("{base}/_media/{key}"), - ]) - .output() - .expect("curl download"); - let headers = String::from_utf8_lossy(&out.stdout).to_ascii_lowercase(); - assert!( - headers.contains("content-disposition: attachment"), - "download headers={headers}" - ); - let dl = std::fs::read_to_string("/tmp/marqdo-upload-dl.txt").expect("dl body"); - assert_eq!(dl, "hello-upload"); - - // Reject wrong type. - let bad = std::path::PathBuf::from(env!("CARGO_MANIFEST_DIR")) - .join("tests/ext/web-fixtures/upload/bad.bin"); - let _ = std::fs::write(&bad, b"not-allowed"); - let out = Command::new("curl") - .args([ - "-s", - "-o", - "/dev/null", - "-w", - "%{http_code}", - "-F", - &format!("file=@{};type=application/octet-stream", bad.display()), - &format!("{base}/_upload"), - ]) - .output() - .expect("curl bad type"); - assert_eq!( - String::from_utf8_lossy(&out.stdout).trim(), - "400", - "bad type should 400" - ); - - // Oversize (> max_bytes=1024). - let big = std::path::PathBuf::from(env!("CARGO_MANIFEST_DIR")) - .join("tests/ext/web-fixtures/upload/big.txt"); - let _ = std::fs::write(&big, vec![b'x'; 2048]); - let out = Command::new("curl") - .args([ - "-s", - "-o", - "/dev/null", - "-w", - "%{http_code}", - "-F", - &format!("file=@{};type=text/plain", big.display()), - &format!("{base}/_upload"), - ]) - .output() - .expect("curl oversize"); - assert_eq!( - String::from_utf8_lossy(&out.stdout).trim(), - "400", - "oversize should 400" - ); - - let _ = child.kill(); - let _ = child.wait(); -} - -#[test] -#[ignore = "ADR 0007 web artifact rewrite — see ext_web_artifact_*"] -fn ext_web_db_w6_smoke() { - // W6: versioned migrate, FTS5 search, published filter + comments table. - ensure_web_plugin_built(); - - let db = std::path::PathBuf::from(env!("CARGO_MANIFEST_DIR")) - .join("tests/ext/web-fixtures/data/w6-smoke.db"); - for suffix in ["", "-wal", "-shm"] { - let _ = std::fs::remove_file(format!("{}{}", db.display(), suffix)); - } - assert_out( - "tests/ext/web-db-w6-smoke.mq.md", - "migrate-ok -migrate-idempotent-ok -published-filter-ok -comments-ok -fts-ok -fts-row-ok", - ); -} - -#[test] -#[ignore = "ADR 0007 web artifact rewrite — see ext_web_artifact_*"] -fn ext_web_ws_broadcast_smoke() { - ensure_web_plugin_built(); - assert_out( - "tests/ext/web-ws-broadcast-smoke.mq.md", - "ws-broadcast-route-ok -access-log-ok", - ); -} - -#[test] -#[ignore = "ADR 0007 web artifact rewrite — see ext_web_artifact_*"] -fn ext_web_w7_finish_smoke() { - ensure_web_plugin_built(); - assert_out( - "tests/ext/web-w7-finish-smoke.mq.md", - "unique-ok -sitemap-ok -redirect-ok -robots-ok -cache-control-ok -error-page-ok", - ); -} - -#[test] -#[ignore = "ADR 0007 web artifact rewrite — see ext_web_artifact_*"] -fn ext_web_w7_live() { - ensure_web_plugin_built(); - - let script = "tests/ext/web-w7-live-server.mq.md"; - let bin = env!("CARGO_BIN_EXE_marqdo"); - let mut child = Command::new(bin) - .args(["run", script]) - .current_dir(env!("CARGO_MANIFEST_DIR")) - .stdout(Stdio::piped()) - .stderr(Stdio::piped()) - .spawn() - .expect("spawn w7 live server"); - - let base = "http://127.0.0.1:18121"; - let ready = std::time::Instant::now(); - loop { - if ready.elapsed().as_secs() > 10 { - let _ = child.kill(); - panic!("w7 live server did not start in time"); - } - let out = Command::new("curl") - .args([ - "-s", - "-o", - "/dev/null", - "-w", - "%{http_code}", - &format!("{base}/"), - ]) - .output() - .expect("curl probe"); - if String::from_utf8_lossy(&out.stdout) == "200" { - break; - } - std::thread::sleep(std::time::Duration::from_millis(300)); - } - - // Permanent redirect - let out = Command::new("curl") - .args([ - "-s", - "-o", - "/dev/null", - "-w", - "%{http_code}|%{redirect_url}", - &format!("{base}/legacy"), - ]) - .output() - .expect("curl redirect"); - let redir = String::from_utf8_lossy(&out.stdout); - assert!( - redir.starts_with("301|") && redir.contains("/"), - "redirect got {redir}" - ); - - // Custom 404 - let out = Command::new("curl") - .args(["-s", "-w", "\n%{http_code}", &format!("{base}/no-such")]) - .output() - .expect("curl 404"); - let body = String::from_utf8_lossy(&out.stdout); - assert!( - body.contains("Not Found Page") && body.trim_end().ends_with("404"), - "404 body={body}" - ); - - // Sitemap - let out = Command::new("curl") - .args(["-s", &format!("{base}/sitemap.xml")]) - .output() - .expect("curl sitemap"); - let sm = String::from_utf8_lossy(&out.stdout); - assert!( - sm.contains(" 10 { - let _ = child.kill(); - panic!("p3 live server did not start in time"); - } - let out = Command::new("curl") - .args([ - "-s", - "-o", - "/dev/null", - "-w", - "%{http_code}", - &format!("{base}/"), - ]) - .output() - .expect("curl probe"); - if String::from_utf8_lossy(&out.stdout) == "200" { - break; - } - std::thread::sleep(std::time::Duration::from_millis(300)); - } - - let out = Command::new("curl") - .args(["-s", &format!("{base}/gallery")]) - .output() - .expect("curl gallery"); - let gal = String::from_utf8_lossy(&out.stdout); - assert!( - gal.contains("P3 Gallery") && gal.contains("hello.txt"), - "gallery={gal}" - ); - - let out = Command::new("curl") - .args([ - "-s", - "-D", - "-", - "-o", - "/dev/null", - &format!("{base}/_media/uploads/hello.txt"), - ]) - .output() - .expect("curl media"); - let headers_raw = String::from_utf8_lossy(&out.stdout); - let headers = headers_raw.to_ascii_lowercase(); - assert!(headers.contains("etag:"), "media headers={headers}"); - let etag = headers_raw - .lines() - .find(|l| l.to_ascii_lowercase().starts_with("etag:")) - .map(|l| l.split_once(':').map(|(_, v)| v.trim().trim_matches('\r').to_string()).unwrap_or_default()) - .expect("etag line"); - - let out = Command::new("curl") - .args([ - "-s", - "-o", - "/dev/null", - "-w", - "%{http_code}", - "-H", - &format!("If-None-Match: {etag}"), - &format!("{base}/_media/uploads/hello.txt"), - ]) - .output() - .expect("curl 304"); - assert_eq!( - String::from_utf8_lossy(&out.stdout), - "304", - "expected 304 for If-None-Match" - ); - - let _ = child.kill(); - let _ = child.wait(); -} - -#[test] -#[ignore = "ADR 0007 web artifact rewrite — see ext_web_artifact_*"] -fn ext_web_ws_broadcast_live() { - use futures_util::{SinkExt, StreamExt}; - use tokio_tungstenite::tungstenite::Message; - - ensure_web_plugin_built(); - - let script = "tests/ext/web-ws-broadcast-live-server.mq.md"; - let bin = env!("CARGO_BIN_EXE_marqdo"); - let mut child = Command::new(bin) - .args(["run", script]) - .current_dir(env!("CARGO_MANIFEST_DIR")) - .stdout(Stdio::piped()) - .stderr(Stdio::piped()) - .spawn() - .expect("spawn ws live server"); - - let base = "http://127.0.0.1:18112"; - let ready = std::time::Instant::now(); - loop { - if ready.elapsed().as_secs() > 10 { - let _ = child.kill(); - panic!("ws live server did not start in time"); - } - let out = Command::new("curl") - .args([ - "-s", - "-o", - "/dev/null", - "-w", - "%{http_code}", - &format!("{base}/"), - ]) - .output() - .expect("curl probe"); - if String::from_utf8_lossy(&out.stdout) == "200" { - break; - } - std::thread::sleep(std::time::Duration::from_millis(300)); - } - - let rt = tokio::runtime::Runtime::new().expect("rt"); - rt.block_on(async { - let (a, _) = tokio_tungstenite::connect_async("ws://127.0.0.1:18112/room") - .await - .expect("connect a"); - let (b, _) = tokio_tungstenite::connect_async("ws://127.0.0.1:18112/room") - .await - .expect("connect b"); - let (mut a_sink, mut a_src) = a.split(); - let (mut b_sink, mut b_src) = b.split(); - - // Give subscriptions a moment to register. - tokio::time::sleep(std::time::Duration::from_millis(50)).await; - - b_sink - .send(Message::Text("ping-from-b".into())) - .await - .expect("send b"); - - let got_a = tokio::time::timeout( - std::time::Duration::from_secs(3), - a_src.next(), - ) - .await - .expect("a timeout") - .expect("a closed") - .expect("a err"); - let got_b = tokio::time::timeout( - std::time::Duration::from_secs(3), - b_src.next(), - ) - .await - .expect("b timeout") - .expect("b closed") - .expect("b err"); - - match got_a { - Message::Text(t) => assert_eq!(t, "ping-from-b"), - other => panic!("a unexpected {other:?}"), - } - match got_b { - Message::Text(t) => assert_eq!(t, "ping-from-b"), - other => panic!("b unexpected {other:?}"), - } - - let _ = a_sink.close().await; - let _ = b_sink.close().await; - }); - - // Access log should have recorded the probe GET /. - let _ = child.kill(); - let out = child.wait_with_output().expect("wait"); - let stderr = String::from_utf8_lossy(&out.stderr); - assert!( - stderr.contains("marqdo web GET / 200"), - "access log missing in stderr={stderr}" - ); -} - -#[test] -#[ignore = "ADR 0007 web artifact rewrite — see ext_web_artifact_*"] -fn ext_web_db_w2_smoke() { - // W2 data layer: transactions, connection pooling, pagination, query - // expressiveness (IN/BETWEEN/OR), and row counting. - ensure_web_plugin_built(); - - let db = std::path::PathBuf::from(env!("CARGO_MANIFEST_DIR")) - .join("tests/ext/web-fixtures/data/w2-smoke.db"); - for suffix in ["", "-wal", "-shm"] { - let _ = std::fs::remove_file(format!("{}{}", db.display(), suffix)); - } - assert_out( - "tests/ext/web-db-w2-smoke.mq.md", - "count-ok -count-where-ok -page-ok -page2-ok -in-ok -between-ok -or-ok -query-ok -txn-commit-ok -txn-rollback-ok", - ); -} #[test] fn ext_linalg_doc_smoke() {