Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
46a0263d7f | ||
|
|
ff252fd469 | ||
|
|
67bac1bf02 |
No files matched your search
@@ -0,0 +1,26 @@
|
||||
---
|
||||
description: Marqdo Web Artifact — no degradation; Document/Endpoint/Resource only
|
||||
globs: ext/web/**,ext/net/**,ext/data/**,ext/security/**,examples/**/*,tests/ext/web*,doc/design/ext-web*,doc/adr/0007*
|
||||
alwaysApply: true
|
||||
---
|
||||
|
||||
# Web Artifact — 不允许降级
|
||||
|
||||
Canonical: `doc/adr/0007-web-document-endpoint.md` · `doc/design/ext-web-artifact.md` · `doc/next/007.md` (superseded).
|
||||
|
||||
## Hard bans
|
||||
|
||||
1. **Do not** restore or reintroduce author-facing `compose_main` / `compose_intro` / `compose_*` fragmented table DSLs, god `# page` mutation piles, or `app.configure(...)` junk-drawer APIs.
|
||||
2. **Do not** use `json.set` / `json.append` bag glue for pages, routes, or middleware. Tables = data. View schema is only `|type|slot|value|attrs|style|` (ZH aliases allowed).
|
||||
3. **Do not** call `ensure_plugin` or `host_*` from author programs or from `ext/**` (plugin load is facade/capability only).
|
||||
4. **Do not** register implicit user routes. Declared routes come from Artifact metadata or `web.route`. System routes (`/_part`, `/_form`, …) must appear in `web.inspect`.
|
||||
5. **Do not** invent DSL, nested frontmatter under `##`, or new table dialects when the design is silent — **stop and ask**.
|
||||
6. **Do not** mix EN/ZH API names in one `.mq.md`.
|
||||
7. **Do not** silently delete capabilities. Removals require design text + tests updated in the same change.
|
||||
8. **Do not** put DB/auth/cache/storage/websocket author APIs back into `ext/web/web.mq.md` — they live in `ext/data`, `ext/security`, `ext/net`.
|
||||
|
||||
## Required direction
|
||||
|
||||
- Document (`type: web` / `类型: 网页`), Endpoint (`type: endpoint` / `类型: 端点`), Resource modules.
|
||||
- Facade only: `web.page` · `web.route` · `web.serve` · `web.render` · `web.inspect` (ZH mirrors).
|
||||
- Code is documentation: the `.mq.md` is the page/API docs and the implementation.
|
||||
@@ -92,7 +92,7 @@ Better still — call a named helper:
|
||||
7. **Do not use `##` inside `# main` for document sectioning** — those become nested functions. Use paragraphs / `---` breaks instead.
|
||||
8. **Index:** prefer `[键](集合)` / `` [`名`](集合) `` over footnote `` m[^k] ``.
|
||||
|
||||
Browser client programs: prefer `import browser:lib/browser.mq.md` (no native plugin). Server sites: `ext/web` + GFM page/style tables.
|
||||
Browser client programs: prefer `import browser:lib/browser.mq.md` (no native plugin). Server sites: Artifact Metadata (`type: web|endpoint`) + `ext/web` facade + `ext/data` / `ext/security` / `ext/net` — see [ext-web-artifact.md](../../doc/design/ext-web-artifact.md). **Never** restore `compose_*` / `app.configure`.
|
||||
|
||||
## Developing libraries (`lib/*`, `ext/*`)
|
||||
|
||||
@@ -121,7 +121,9 @@ Canonical thin-template + waves: [lib-code-as-docs.md](../../doc/design/lib-code
|
||||
| Need | Place |
|
||||
|------|--------|
|
||||
| Browser effect maps (WASM client) | `lib/browser.mq.md` |
|
||||
| Site HTML / HTTP / DB | `ext/web` classes + compose from tables |
|
||||
| Site HTML / HTTP | `ext/web` Document/Endpoint + View tables |
|
||||
| DB / cache / storage | `ext/data` |
|
||||
| Auth / OIDC / RBAC | `ext/security` |
|
||||
| List/map primitives | `lib/table.mq.md` |
|
||||
| Parse JSON text | `lib/json.mq.md` only |
|
||||
|
||||
|
||||
@@ -224,44 +224,53 @@ APIs: `# agent` / `# 智能体` → `## run` / `## route` / `## step` / `## plan
|
||||
|
||||
Examples: [agent-pong](../../examples/agent-pong/) · [agent-okf-flywheel](../../examples/agent-okf-flywheel/). Harness: `scripts/agent-harness.sh`. Design: [ext-agent.md](../../doc/design/ext-agent.md) · Wave B: [agent-framework-2026-09.md](../../doc/research/agent-framework-2026-09.md) · v2: [doc/next/003.md](../../doc/next/003.md) · P4: [doc/next/004.md](../../doc/next/004.md). Dev LLM: copy [.env.example](../../.env.example) → `.env` (gitignored).
|
||||
|
||||
## Official extension: `ext/web` (dynamic sites)
|
||||
## Official extension: `ext/web` (Document / Endpoint / Resource)
|
||||
|
||||
Install: `marqdo ext add web` (ZH id: `网页`). Build native plugin first: `cargo build --release -p marqdo_plugin_web`.
|
||||
Install: `marqdo ext add web` (ZH id: `网页`). Build native plugin: `scripts/build-web-plugin.sh` / `marqdo ext add web`.
|
||||
|
||||
Import **one language file** — never mix EN/ZH API names in the same `.mq.md`:
|
||||
**Constitution (ADR 0007 — do not degrade):**
|
||||
|
||||
- EN: `import web:ext/web/web.mq.md`
|
||||
1. **Document / Endpoint / Resource** — `.mq.md` with `type: web|endpoint` (ZH `类型: 网页|端点`) is the site surface; not a Flask-style class pile.
|
||||
2. **Code is documentation** — the file is docs + route + handler.
|
||||
3. **Table = data** — View schema only `|type|slot|value|attrs|style|`. No `compose_*` dialects, no `json.set` glue.
|
||||
4. **Facade only** — `web.page` · `web.route` · `web.serve` · `web.render` · `web.inspect`. DB → `ext/data`; auth → `ext/security`; ws/http → `ext/net`.
|
||||
5. **No author `ensure_plugin` / `host_*`**; import web = capability (plugin auto-load).
|
||||
6. **Declared vs system routes**; `web.inspect` lists both. No silent user routes.
|
||||
|
||||
Import **one language** per file:
|
||||
|
||||
- EN: `import web:ext/web/web.mq.md` (+ `import data:ext/data/db.mq.md` as needed)
|
||||
- ZH: `导入 网页:ext/web/网页.mq.md`
|
||||
|
||||
**Hard rules (web):**
|
||||
```markdown
|
||||
---
|
||||
type: web
|
||||
route: /
|
||||
title: Hello
|
||||
import web:ext/web/web.mq.md
|
||||
---
|
||||
|
||||
- Authors use **GFM tables + `#` classes** — no `json.parse` / `json.set` glue, no hand-built part JSON.
|
||||
- Table cells stay **literal strings**; path text like `` `posts`.`title` `` is resolved by web classes.
|
||||
- **Quote path/MIME cells** that contain `/` (T5 cell expressions treat bare `/` as division): `"/static/logo.svg"`, `"image/png"`.
|
||||
- **`ext/**` never calls `host_*`** — hot path is native `plugins/web` ABI (default **Go `libweb`**, build via `scripts/build-web-plugin.sh`).
|
||||
- HTTPS: terminate at reverse proxy; set `cookie_secure=True` on auth (no in-process TLS).
|
||||
# Hello
|
||||
|
||||
**Typical layout:**
|
||||
|
||||
```text
|
||||
index.mq.md # entry + home page table + listen
|
||||
pages/ # sub-pages
|
||||
components/ # reusable |属性|值|样式| tables
|
||||
styles/ # CSS modules
|
||||
public/ # static + favicon.ico|png|svg
|
||||
db/ # schema + open/init
|
||||
data/ # sqlite runtime (gitignore)
|
||||
Executable document as a page.
|
||||
```
|
||||
|
||||
**Core objects (EN / ZH):** `# page`/`页面`, `# style`/`样式`, `# db`/`数据库`, `# form`/`表单`, `# app`/`应用`, `# auth`/`鉴权`, `# cache`/`缓存`, `# storage`/`存储`.
|
||||
```markdown
|
||||
---
|
||||
type: endpoint
|
||||
method: POST
|
||||
path: /api/ping
|
||||
response: json
|
||||
---
|
||||
|
||||
**Typical flow:** `db.init` → `page.compose_*` → `app` + `static` / `listen`. Client: `marqdo wasm build -o static` + `web.client_embed source="/static/client.mq.md"` — **no author JS**; bridge may implement rich host effects ([browser-wasm-e.md](../../doc/roadmap/browser-wasm-e.md) · [browser-app](../../examples/browser-app/)).
|
||||
*{"ok": true}*
|
||||
```
|
||||
|
||||
**Shipped surface (W0–W7 + P3 + W8 + route D mount):** middleware + JSON API (`app.configure`); transactions, pagination, FTS search (`db.migrate`, `db.fts`, `db.search`); security (argon2, CSRF, SQLite sessions, login rate limit); SEO / RSS / Markdown (`page.meta`, `route_rss`, `lib/net.markdown_parse`); upload / download / gallery; sitemap / robots / error pages / redirects; RBAC (`app.gate`, user `role`); audit timestamps + FK in `db.init`; ETag on downloads; **W8** site icons (`app.icons` → `/favicon.ico`), head resource tables (`page.head`), image assembly (`make_images` / `page.images`); **表驱动引言** `page.compose_intro` / `页面.引言装配`(属性/值/样式表 → `.main-intro`,避免手写 HTML 字符串);**D** `client_embed` auto-mount + DOM effect helpers (`text_patch` / `dom_patch`).
|
||||
Site entry may `# main` → `web.serve root="."`. Client WASM: `ext/web/client.mq.md` / `lib/browser` — no author JS.
|
||||
|
||||
Design: [ext-web.md](../../doc/design/ext-web.md) · assets: [web-assets-and-images.md](../../doc/design/web-assets-and-images.md) · capability matrix: [web-net-capabilities.md](../../doc/design/web-net-capabilities.md) · example: [examples/marqdo-blog/](../../examples/marqdo-blog/) · client: [examples/web-client-site/](../../examples/web-client-site/).
|
||||
Design: [ext-web-artifact.md](../../doc/design/ext-web-artifact.md) · ADR [0007](../../doc/adr/0007-web-document-endpoint.md) · rule: `.cursor/rules/web-artifact-no-degrade.mdc` · example: [examples/marqdo-blog/](../../examples/marqdo-blog/).
|
||||
|
||||
Web patterns: [examples.md](examples.md) §13 · API index: [reference.md](reference.md).
|
||||
Web patterns: [examples.md](examples.md) · API index: [reference.md](reference.md).
|
||||
|
||||
## Official extension: `ext/quantum` (circuits + Q7/Q8)
|
||||
|
||||
@@ -325,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 |
|
||||
|
||||
@@ -126,10 +126,10 @@ jobs:
|
||||
## Marqdo ${{ github.ref_name }}
|
||||
|
||||
### 亮点 / Highlights
|
||||
- **v1.2.0**:Web Artifact(ADR 0007)——Document/Endpoint · `web.serve`/`render`/`inspect` · `ext/data|security|net` · 移除 `compose_*`/`configure`
|
||||
- **v1.2.0**: Web Artifact (ADR 0007) — Document/Endpoint, web.serve/render/inspect, ext/data|security|net, compose_*/configure removed
|
||||
- **v1.1.1**:AI 栈收口——llm `ask`/`stream`/`collect` · Metadata Binding · Skill Compilation + Adaptive Routing · MCP 客户端 + resume · 可选 `plugins/llm`
|
||||
- **v1.1.1**: AI stack — llm ask/stream/collect, Metadata Binding, Skill Compilation + Adaptive Routing, MCP client + resume, optional plugins/llm
|
||||
- **v1.1.0**:AI 原生闭环三件套——核心表面守卫 · 渐进式契约 + `marqdo check` · **MLSP for AI** · `run --json`
|
||||
- **v1.1.0**: AI-native loop — core-surface guard, progressive contracts + `marqdo check`, **MLSP for AI**, `run --json`
|
||||
- **v1.0.7**:WS/网络边界加固;`url_encode` `%20`
|
||||
- **v1.0.3**:Ubuntu PPA + 扩展 CDN(ext.marqdo.com)
|
||||
- **Linux 包必出**:`*-native-x86_64-unknown-linux-gnu.zip` + Linux CLI bundle
|
||||
|
||||
@@ -8,6 +8,41 @@
|
||||
|
||||
### Changed
|
||||
|
||||
## v1.2.0 — 2026-09-28
|
||||
|
||||
### Highlights
|
||||
|
||||
**Web Artifact 重写(ADR 0007)**:Document / Endpoint / Resource 一等公民;`type: web|endpoint`(ZH `类型: 网页|端点`);facade `web.page|route|serve|render|inspect|use`;DB/auth/ws 拆到 `ext/data` · `ext/security` · `ext/net`。本版 CLI 与扩展包 **同步为 1.2.0**。
|
||||
|
||||
- **Document**:文件级 Artifact + `data_source` / `data_order` / `data_where`;正文 Markdown → HTML;列表卡片 / 详情文章由 serve 时加载。
|
||||
- **Endpoint**:`# main` 处理器;请求经 `run_artifact` Binding 注入;`response` 序列化 JSON/text/html。
|
||||
- **破坏性**:删除作者面 `compose_*` / `app.configure` / 作者 `ensure_plugin`;旧 web gold 移除,新金样 `ext_web_*`。
|
||||
- **示例**:`examples/marqdo-blog/` Artifact 站(pages/api/db + smoke);`web-client-site` serve 扫描。
|
||||
|
||||
```bash
|
||||
sudo add-apt-repository ppa:cflmy/marqdo && sudo apt update && sudo apt install marqdo
|
||||
git checkout v1.2.0 && cargo build --release
|
||||
bash scripts/build-web-plugin.sh && marqdo ext add web
|
||||
marqdo run examples/marqdo-blog/serve.mq.md
|
||||
```
|
||||
|
||||
**核心表面 Δ(Core surface Δ)**:**无增删**——复用 Metadata `type`;装配语义在 ext + plugin。语言标记不变。
|
||||
|
||||
### Added
|
||||
- **Web Artifact 模型(ADR 0007)**:`type: web|endpoint`(ZH `类型: 网页|端点`);核心 `src/artifact/`;`sys.artifact_kind`;无 `# main` 时 Result 摘要。
|
||||
- **`ext/web` facade**:`page` · `route` · `serve` · `render` · `inspect` · `use`;子模块 page/route/dom/client/component。
|
||||
- **`ext/data` · `ext/security` · `ext/net`**:从 monolithic web 拆出 Resource。
|
||||
- **统一 View** `|type|slot|value|attrs|style|` + ABI `web_render_nodes` / `web_serve_root` / `web_inspect` / `web_app_use`。
|
||||
- **规则**:`.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 已移除;新金样 `web-artifact-*` / `ext_web_*`。
|
||||
- **核心表面 Δ**:**无增删**(复用 Metadata `type`)。
|
||||
- 修订 `ext-web.md` C1;`doc/next/007.md` superseded。
|
||||
|
||||
## v1.1.1 — 2026-09-24
|
||||
|
||||
### Highlights
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "marqdo"
|
||||
version = "1.1.1"
|
||||
version = "1.2.0"
|
||||
edition = "2021"
|
||||
license = "Apache-2.0"
|
||||
description = "Marqdo — Markdown markers as an interpreted programming language"
|
||||
|
||||
@@ -142,8 +142,9 @@ marqdo catalog public -o .marqdo
|
||||
|
||||
---
|
||||
|
||||
## 现状(v1.1.1)
|
||||
## 现状(v1.2.0)
|
||||
|
||||
- **Web Artifact(v1.2.0 · ADR 0007)**:Document/Endpoint 一等公民(`type: web|endpoint`)· facade `page`/`route`/`serve`/`render`/`inspect`/`use` · Resource 拆到 `ext/data`/`security`/`net` · 统一 View 表 · 破坏性移除 `compose_*`/`configure`
|
||||
- **AI 栈(v1.1.1)**:`ext/ai/llm` 语义 `ask`/`stream`/`collect` · Artifact Metadata Binding(`${env|arg|sys|secret}`)· Agent Skill Compilation + Adaptive Routing · MCP stdio 客户端 + resume 检查点 · 可选 `plugins/llm` Transport ABI
|
||||
- **AI 原生闭环(v1.1.0)**:核心表面守卫(19 构造,单边改动 CI 必红)· **渐进式契约**(文档内嵌 `参数`/`返回`/`字段` 表 + 四边界校验 + `marqdo check` 防漂移)· **MLSP for AI**(`marqdo mlsp`:`locate`/`syntax`/`validate`/`repair_targets`/`repair_apply`/`schema`,AI 按需查语法而非背诵)· **结构化诊断**(`run --json`,错误即数据);验证见 [perf-validation-report-2026-09-23.md](doc/roadmap/perf-validation-report-2026-09-23.md)
|
||||
- 映射与解释器:**v0.3 语法宪法**(`**` 代码 / `*` 返回 / 叙述声明);Phase I 树遍历 + 字节码后端;金样例在 `tests/` 与 `tests/markup-v03/`
|
||||
@@ -154,7 +155,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)
|
||||
@@ -166,7 +167,7 @@ marqdo catalog public -o .marqdo
|
||||
- **浏览器 Marqdo(WASM)**:`marqdo wasm build` + 官方 bridge 自启(作者零业务 JS;桥内可含列表/路由/storage/ws/文件/Canvas/音频/Observer/拖放);`lib/browser` + GFM;`web.client_embed`;示例 [browser-hello](examples/browser-hello/) · [browser-app](examples/browser-app/) · [browser-media](examples/browser-media/) · [web-client-site](examples/web-client-site/)([ADR 0002](doc/adr/0002-browser-marqdo-wasm.md) · [D](doc/roadmap/browser-wasm-d.md) · [E](doc/roadmap/browser-wasm-e.md) · [F](doc/roadmap/browser-wasm-f.md))
|
||||
- 选型:[ADR 0001 — Rust](doc/adr/0001-implementation-language.md) · [ADR 0002 — 浏览器 WASM](doc/adr/0002-browser-marqdo-wasm.md)(C0–C5 完结,见 [roadmap/browser-wasm.md](doc/roadmap/browser-wasm.md))· [ADR 0003 — 异步效应](doc/adr/0003-browser-async-effects.md)
|
||||
|
||||
### 如何使用最新 Marqdo(v1.1.1)
|
||||
### 如何使用最新 Marqdo(v1.2.0)
|
||||
|
||||
**安装解释器(任选其一)**
|
||||
|
||||
@@ -181,7 +182,7 @@ marqdo catalog public -o .marqdo
|
||||
```bash
|
||||
# 1) 源码安装(跟 tag 或 main)
|
||||
git clone https://github.com/cflmy/marqdo.git && cd marqdo
|
||||
git checkout v1.1.1 # 或留在 main
|
||||
git checkout v1.2.0 # 或留在 main
|
||||
cargo build --release
|
||||
export PATH="$PWD/target/release:$PATH"
|
||||
marqdo version
|
||||
@@ -211,7 +212,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
|
||||
|
||||
@@ -220,7 +221,7 @@ marqdo wasm build
|
||||
# → dist/wasm/ … 见 examples/browser-hello/
|
||||
|
||||
# 6) Releases:Windows exe/zip/vsix;Linux CLI zip + native `.so` zip
|
||||
# https://github.com/cflmy/marqdo/releases/tag/v1.1.1
|
||||
# https://github.com/cflmy/marqdo/releases/tag/v1.2.0
|
||||
```
|
||||
|
||||
开发期也可用 `cargo run -- …` 代替已安装的 `marqdo`:
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "marqdo-wasm"
|
||||
version = "1.1.1"
|
||||
version = "1.2.0"
|
||||
edition = "2021"
|
||||
license = "Apache-2.0"
|
||||
description = "Marqdo interpreter as WebAssembly (browser host bridge)"
|
||||
|
||||
Vendored
+8
@@ -1,3 +1,11 @@
|
||||
marqdo (1.2.0-1ppa1) noble; urgency=medium
|
||||
|
||||
* Marqdo 1.2.0: Web Artifact rewrite (ADR 0007) — Document/Endpoint/Resource,
|
||||
type:web|endpoint, web.serve/render/inspect, ext/data|security|net split,
|
||||
compose_* author surface removed; marqdo-blog Artifact example.
|
||||
|
||||
-- cflmy <pingan@cflmy.cn> Mon, 28 Sep 2026 11:39:04 +0800
|
||||
|
||||
marqdo (1.1.1-1ppa1) noble; urgency=medium
|
||||
|
||||
* Marqdo 1.1.1: AI stack closure — llm ask/stream/collect, Metadata Binding,
|
||||
|
||||
@@ -0,0 +1,54 @@
|
||||
# ADR 0007:Web Document / Endpoint / Resource(破坏性 · 代码即文档)
|
||||
|
||||
| | |
|
||||
|---|---|
|
||||
| Status | **Accepted** |
|
||||
| Date | 2026-09-28 |
|
||||
| Related | [ext-web-artifact.md](../design/ext-web-artifact.md) · [ext-web.md](../design/ext-web.md) · [binding.md](../design/binding.md) · ADR [0006](0006-artifact-metadata-binding.md) · [layers.md](../design/layers.md) · [doc/next/007.md](../next/007.md) |
|
||||
|
||||
## Context
|
||||
|
||||
- [`ext/web/web.mq.md`](../../ext/web/web.mq.md) 已膨胀为小型 Web Framework(Page God Object、`configure` 垃圾抽屉、碎片 Table DSL、隐式路由),与 Marqdo「代码即文档」冲突。
|
||||
- [doc/next/007.md](../next/007.md) 提出 Document / Endpoint / Resource 三原语与拆分 `ext/web` · `ext/net` · `ext/data` · `ext/security`。
|
||||
- 现行 [ext-web.md](../design/ext-web.md) **C1** 禁止为 web 改核心;Document/Endpoint 装载识别需要 Language/Runtime 参与(复用 Artifact Metadata `type`,**不**新增 CORE_CONSTRUCTS 标记)。
|
||||
- Binding(ADR 0006)已提供文件级 Metadata;`type: prompt` 先例在扩展侧消费 metadata。
|
||||
|
||||
## Decision
|
||||
|
||||
1. **采纳** Document / Endpoint / Resource 为 Web 模型一等公民;正式规范见 [ext-web-artifact.md](../design/ext-web-artifact.md)。
|
||||
2. **修订 ext-web C1**:允许核心在装载期识别 `type: web|endpoint`(及中文 `类型: 网页|端点`)并暴露 artifact 分类;**装配 / HTTP / DB 语义仍在 ext + plugin**。单元格求值、import 句法、CORE_CONSTRUCTS 计数不变。
|
||||
3. **文件级 Artifact only**:不在 `##` 函数体嵌套 `---` frontmatter(与 Binding Phase 1 / 解析器一致)。
|
||||
4. **破坏性重写作者面**:删除 `compose_*` 碎片 DSL、god `# page` 变异堆、`app.configure` 多参数抽屉、作者 `ensure_plugin`;examples 与 `tests/ext/web*` 同步重写。
|
||||
5. **目录定稿**(007 §三十五 + §四十):
|
||||
- `ext/web/` — page · route · component · dom · client · facade
|
||||
- `ext/net/` — http · websocket · url
|
||||
- `ext/data/` — db · cache · storage
|
||||
- `ext/security/` — auth · oidc · rbac
|
||||
6. **统一 View 表**:`| type | slot | value | attrs | style |`;Table = Data,禁止每函数私有方言。
|
||||
7. **declared vs system routes**:用户 route 须声明;`/_part` · `/_form` 等为 system,经 `web.inspect` 可见。
|
||||
8. **import = capability**:`import web:…` 由 facade 自动加载 native plugin;作者程序不写 `ensure_plugin` / `host_*`。
|
||||
9. **Metadata v1 锁定(原 007 未决项)**:
|
||||
- 发现:`web.serve root=` 扫描 `root/**/*.mq.md`,仅注册 `type`/`类型` ∈ {web,网页,endpoint,端点} 的文件;无 type 的库文件忽略。
|
||||
- Data:仅 flat 键 `data_source` · `data_order` · `data_where`(text;where 为 `col=val` 逗号分隔)。嵌套 YAML `data:` 推迟。
|
||||
- Result:`{ok: bool, value: any, error: text|None}`。
|
||||
- Realtime 模块名:`ext/net/websocket.mq.md`(ZH:`实时.mq.md`)。
|
||||
- ZH metadata:`类型`←type,`路由`←route,`方法`←method,`路径`←path,`请求`←request,`响应`←response,`鉴权`←auth,`数据源`←data_source,`排序`←data_order,`条件`←data_where。
|
||||
|
||||
## Consequences
|
||||
|
||||
### Positive
|
||||
|
||||
- `.mq.md` 同时是文档、路由、实现与鉴权声明。
|
||||
- 与 LLM/Agent Artifact Metadata 统一心智。
|
||||
- 职责边界清晰,可独立演化 data/security/net。
|
||||
|
||||
### Negative / Risks
|
||||
|
||||
- 破坏性:全部现有 web 作者程序与 smokes 必须改写。
|
||||
- Endpoint 热路径仍经 plugin → `CallLibPath` / 文件装载回调;须保持 ABI 稳定演进。
|
||||
- flat data 键表达力弱于嵌套 YAML;后续另 ADR。
|
||||
|
||||
### Neutral
|
||||
|
||||
- 不新增 Markdown 核心标记;`${…}` 仍仅 Metadata。
|
||||
- Go `plugins/web` 可分波删除死 compose ABI;作者面先断。
|
||||
@@ -0,0 +1,197 @@
|
||||
# 官方扩展:Web Artifact(Document / Endpoint / Resource)
|
||||
|
||||
| | |
|
||||
|---|---|
|
||||
| 状态 | **Accepted · 破坏性(取代 page/app God Object 作者面)** |
|
||||
| 日期 | 2026-09-28 |
|
||||
| ADR | [0007-web-document-endpoint.md](../adr/0007-web-document-endpoint.md) |
|
||||
| 讨论稿 | [doc/next/007.md](../next/007.md)(superseded) |
|
||||
| 安装 | `marqdo ext add web`(`web` / `网页`) |
|
||||
| 相关 | [binding.md](binding.md) · [ext-web.md](ext-web.md) · [stdlib-i18n.md](stdlib-i18n.md) · [layers.md](layers.md) |
|
||||
|
||||
---
|
||||
|
||||
## 0. 一句话
|
||||
|
||||
> **Document describes the page. Table describes the data. Endpoint describes the interaction. Metadata describes the runtime. Marqdo executes all of them.**
|
||||
|
||||
---
|
||||
|
||||
## 1. 三原语
|
||||
|
||||
| Artifact | Metadata `type` / `类型` | 含义 |
|
||||
|----------|--------------------------|------|
|
||||
| **Document** | `web` / `网页` | Markdown 正文 + View → HTML;`route`/`路由` 注册 declared HTTP |
|
||||
| **Endpoint** | `endpoint` / `端点` | 可执行正文为 handler;`path`+`method` 注册 API |
|
||||
| **Resource** | (绑定/导入) | `ext/data` · `ext/security` · 未来 LLM 等,经 metadata / import 声明 |
|
||||
|
||||
核心装载识别 `type`/`类型`(见 `src/artifact/`);渲染与 listen 在 `ext/web` + `plugins/web`。
|
||||
|
||||
---
|
||||
|
||||
## 2. 目录
|
||||
|
||||
```text
|
||||
ext/web/
|
||||
web.mq.md · 网页.mq.md # facade: page route serve render inspect
|
||||
page.mq.md · route.mq.md · component.mq.md · dom.mq.md · client.mq.md
|
||||
ext/net/ http.mq.md · websocket.mq.md · url.mq.md
|
||||
ext/data/ db.mq.md · cache.mq.md · storage.mq.md
|
||||
ext/security/ auth.mq.md · oidc.mq.md · rbac.mq.md
|
||||
```
|
||||
|
||||
作者入口通常:
|
||||
|
||||
```text
|
||||
site/
|
||||
index.mq.md # type: web · route: / · 或 # main → web.serve
|
||||
pages/*.mq.md # type: web
|
||||
api/*.mq.md # type: endpoint
|
||||
data/ # sqlite runtime (gitignore)
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 3. Document(`type: web`)
|
||||
|
||||
```markdown
|
||||
---
|
||||
type: web
|
||||
title: Marqdo Blog
|
||||
route: /
|
||||
method: GET
|
||||
data_source: posts
|
||||
data_order: -created_at
|
||||
import web:ext/web/web.mq.md
|
||||
import data:ext/data/db.mq.md
|
||||
---
|
||||
|
||||
# Marqdo
|
||||
|
||||
Welcome to the executable web.
|
||||
```
|
||||
|
||||
| 键 (EN) | 键 (ZH) | 说明 |
|
||||
|---------|---------|------|
|
||||
| `type` | `类型` | `web` / `网页` |
|
||||
| `route` | `路由` | 路径,可含 `{param}` |
|
||||
| `method` | `方法` | 默认 `GET` |
|
||||
| `title` | `标题` | 文档标题 / `<title>` |
|
||||
| `data_source` | `数据源` | 表名 |
|
||||
| `data_order` | `排序` | 如 `-created_at` |
|
||||
| `data_where` | `条件` | `col=val,col2=val2` |
|
||||
|
||||
正文 Markdown 经 `dom` 变为 DOM Artifact,再 `web.render`。可选 View 表:
|
||||
|
||||
```markdown
|
||||
`nodes` =
|
||||
|
||||
| type | slot | value | attrs | style |
|
||||
|------|------|-------|-------|-------|
|
||||
| text | kicker | AI Native | | eyebrow |
|
||||
| title | title | Marqdo | | title |
|
||||
```
|
||||
|
||||
`page.render nodes=` 是**唯一**主装配路径。禁止 `compose_main` / `compose_intro` 等碎片 DSL。
|
||||
|
||||
---
|
||||
|
||||
## 4. Endpoint(`type: endpoint`)
|
||||
|
||||
```markdown
|
||||
---
|
||||
type: endpoint
|
||||
method: POST
|
||||
path: /api/posts
|
||||
request: json
|
||||
response: json
|
||||
auth: member
|
||||
import data:ext/data/db.mq.md
|
||||
---
|
||||
|
||||
**post = > data.db.insert …**
|
||||
|
||||
*post*
|
||||
```
|
||||
|
||||
| 键 (EN) | 键 (ZH) | 说明 |
|
||||
|---------|---------|------|
|
||||
| `type` | `类型` | `endpoint` / `端点` |
|
||||
| `path` | `路径` | URL |
|
||||
| `method` | `方法` | GET/POST/… |
|
||||
| `request` | `请求` | `json` / `form` / `none` |
|
||||
| `response` | `响应` | `json` / `text` / `html` |
|
||||
| `auth` | `鉴权` | 角色名或 `none` |
|
||||
|
||||
正文在请求时执行;返回值按 `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)
|
||||
|
||||
| EN | ZH | 作用 |
|
||||
|----|-----|------|
|
||||
| `web.page` | `网页.页面` | 从 metadata/正文/nodes 构造 Document 句柄 |
|
||||
| `web.route` | `网页.路由` | 注册 declared Document 或 Endpoint |
|
||||
| `web.serve` | `网页.服务` | `root=` 扫描注册 + listen |
|
||||
| `web.render` | `网页.渲染` | Document → HTML(离线/预览) |
|
||||
| `web.inspect` | `网页.检视` | `{declared, system}` 路由表 |
|
||||
|
||||
Middleware 一等:`web.use` / `route.use`,表驱动;**禁止** `configure(cors, security, …)` 垃圾抽屉。
|
||||
|
||||
---
|
||||
|
||||
## 6. 发现算法(锁定)
|
||||
|
||||
`web.serve root=DIR host=… port=…`:
|
||||
|
||||
1. 递归枚举 `DIR` 下 `*.mq.md`(跳过 `data/`、隐藏目录、`node_modules`)。
|
||||
2. 解析文件头 Metadata;无 `type`/`类型` 或非 web/endpoint → 跳过。
|
||||
3. Document → declared route(缺 `route` 则相对 `root` 的路径映射,`index.mq.md` → `/`)。
|
||||
4. Endpoint → declared path+method(`path`/`路径` 必需)。
|
||||
5. System routes(`/_part/*`、`/_form/*`、静态等)由 runtime 挂载,仅出现在 `inspect.system`。
|
||||
6. 调用 native listen。
|
||||
|
||||
---
|
||||
|
||||
## 7. Table 规则
|
||||
|
||||
- **View**:仅 `|type|slot|value|attrs|style|`(及列名 ZH 别名:`类型|槽|值|属性|样式`)。
|
||||
- **Resource schema**:`|字段|类型|可空|` 等 — 专用且文档化,不是函数私有方言。
|
||||
- **禁止** `|属性|值|样式|` / `|front|back|css|` / `|组件|样式|` 作为页面主装配(已删除)。
|
||||
- Raw HTML/CSS = escape hatch(`dom.raw` / `page.css`),不是默认语言。
|
||||
|
||||
---
|
||||
|
||||
## 8. Result
|
||||
|
||||
所有易失败的 Resource / Endpoint 边界返回 map:
|
||||
|
||||
| 键 | 类型 | 说明 |
|
||||
|----|------|------|
|
||||
| `ok` | bool | 成功 |
|
||||
| `value` | any | 成功载荷 |
|
||||
| `error` | text \| None | 失败信息 |
|
||||
|
||||
---
|
||||
|
||||
## 9. 硬约束(取代旧 C1–C7 作者面)
|
||||
|
||||
| # | 约束 |
|
||||
|---|------|
|
||||
| A1 | Document/Endpoint 由核心识别 `type`;装配在 ext(ADR 0007) |
|
||||
| A2 | 禁止 `json.set` 袋胶水;Table = Data |
|
||||
| A3 | 中英分文件;同文件禁止混 API |
|
||||
| A4 | 禁止作者 `ensure_plugin` / `host_*` |
|
||||
| A5 | 禁止隐式用户 route;system 须 `inspect` 可见 |
|
||||
| A6 | 禁止恢复 `compose_*` / `app.configure` / god page 变异堆 |
|
||||
| A7 | 能力只许迁移/提升;删除须本设计明示 + tests 同步 |
|
||||
| A8 | 设计未锁定处停工提问,禁止自行发明 DSL |
|
||||
|
||||
---
|
||||
|
||||
## 10. 与旧 ext-web.md
|
||||
|
||||
旧「页面表 + compose_* + app.route」作者面 **废止**。历史能力矩阵见 [web-net-capabilities.md](web-net-capabilities.md);迁移后以本文件与 ADR 0007 为准。
|
||||
+17
-13
@@ -2,18 +2,21 @@
|
||||
|
||||
| | |
|
||||
|---|---|
|
||||
| 状态 | **Accepted · W0–W7 + P3 + W8(站点图标/Head/图片装配)完结**(SQLite/Postgres 作者面:页面装配 / db CRUD+`where` / form / 嵌入主区 / `app.route` / 路由 `/_part` / admin UI / RBAC / 上传相册 / SEO·RSS·sitemap / **favicon·头资源·图片装配**;Postgres 等见 §9) |
|
||||
| 日期 | 2026-08-11(W8:2026-08-29;请求上下文:2026-09-18) |
|
||||
| 相关 | [markdown-mapping.md](markdown-mapping.md) · [module-namespace.md](module-namespace.md) · [objects.md](objects.md) · [ext-abi.md](ext-abi.md) · [ext-cli.md](ext-cli.md) · [stdlib-i18n.md](stdlib-i18n.md) · [web-assets-and-images.md](web-assets-and-images.md) · **[ext-web-request-context.md](ext-web-request-context.md)** |
|
||||
| 状态 | **Superseded(作者面)· 历史能力档案** — 现行作者面见 **[ext-web-artifact.md](ext-web-artifact.md)** · ADR [0007](../adr/0007-web-document-endpoint.md) |
|
||||
| 日期 | 2026-08-11(W8:2026-08-29;请求上下文:2026-09-18;Artifact 重构:2026-09-28) |
|
||||
| 相关 | [ext-web-artifact.md](ext-web-artifact.md) · [markdown-mapping.md](markdown-mapping.md) · [module-namespace.md](module-namespace.md) · [objects.md](objects.md) · [ext-abi.md](ext-abi.md) · [ext-cli.md](ext-cli.md) · [stdlib-i18n.md](stdlib-i18n.md) · [web-assets-and-images.md](web-assets-and-images.md) · **[ext-web-request-context.md](ext-web-request-context.md)** |
|
||||
| 安装(目标) | `marqdo ext add web`(中英:`web` / `网页`) |
|
||||
| 本文目的 | 锁定**作者面**与**类 API**;指导实现 |
|
||||
| 本文目的 | **历史**类 API 与能力矩阵;新站请勿按本文 `compose_*` / `app.configure` 写作 |
|
||||
|
||||
> **2026-09-28**:作者面迁移到 Document / Endpoint / Resource。C1 已由 ADR 0007 修订。下文保留作迁移对照,**不是**现行推荐 API。
|
||||
|
||||
---
|
||||
|
||||
## 0. 一句话
|
||||
|
||||
`ext/web` 用 **GFM 表格 + Marqdo 类方法** 描述动态网站:表仍是字典/列表嵌套;类方法把表装配成可渲染页面。
|
||||
**不改 Marqdo 核心语法**;扩展库存在的理由,正是让「文档即代码」在网站场景下成立。
|
||||
**现行**:`.mq.md` Artifact(`type: web|endpoint`)描述页面与交互;见 [ext-web-artifact.md](ext-web-artifact.md)。
|
||||
|
||||
**历史(废止)**:`ext/web` 曾用 GFM 表格 + `# page`/`# app` 类方法拼装站点。该模型因 God Object / 碎片 DSL / 隐式路由被破坏性替换。
|
||||
|
||||
---
|
||||
|
||||
@@ -41,13 +44,14 @@
|
||||
|
||||
| # | 约束 |
|
||||
|---|------|
|
||||
| C1 | **禁止**为 web 改动 Marqdo 核心:单元格求值、import、点号值读取等保持不变 |
|
||||
| C2 | 作者面**禁止** `json.parse` / `json.set` 袋胶水、手写 part JSON、手写 assemble 袋 |
|
||||
| C3 | 能力以 **`#` 类 + `##` 方法** 暴露;**英文库文件只用英文名,中文库文件只用中文名**(见 [stdlib-i18n.md](stdlib-i18n.md));同一 `.mq.md` 内禁止中英 API 混排 |
|
||||
| C4 | 首页在 **`index.mq.md`**:页面表在此;可复用片段进 `components/`;主体可就地写 |
|
||||
| C5 | **旧有网络扩展库全部废弃**:`plugins/web`、`ext/web/**`(含现网示例/gold 中依赖旧 API 者)评审通过后**删除或清空后重写**;禁止在旧代码上打补丁演进。**落实**:原生层 Go 全量重写见 [ext-web-go-rewrite.md](ext-web-go-rewrite.md);作者面 ABI 名保持兼容 |
|
||||
| C6 | `# db` / `# 数据库` 必须提供完整**增删改查**;列表查询英文方法名为 **`select`**(中文 **`查询`**);后台 `/admin` 与表单提交走同一套写库 API |
|
||||
| C7 | 用户输入经 `# form` / `# 表单`:字段表 + 校验表;**服务端校验必须在写库前执行**(见 §5.5) |
|
||||
| C1 | **修订(ADR 0007)**:核心可识别 Artifact `type: web\|endpoint`(及 ZH);**不**新增 CORE_CONSTRUCTS 标记;单元格求值 / import 句法不变;装配语义仍在 ext + plugin。旧文「禁止为 web 改核心」作废 |
|
||||
| C2 | 作者面**禁止** `json.parse` / `json.set` 袋胶水(现行见 ext-web-artifact A2) |
|
||||
| C3 | 中英分文件;同文件禁止混 API(现行 A3) |
|
||||
| C4 | **废止**「页面表 + compose」心智 → Document Artifact + `pages/` · `api/` |
|
||||
| C5 | 破坏性重写作者面(ADR 0007);原生 Go 演进见 [ext-web-go-rewrite.md](ext-web-go-rewrite.md) |
|
||||
| C6 | DB 迁至 **`ext/data`**;CRUD 仍须完整(`select` / `查询`) |
|
||||
| C7 | 表单校验仍须在写库前执行;挂载经 declared Endpoint / system `/_form`(inspect 可见) |
|
||||
| A1–A8 | **现行硬约束**见 [ext-web-artifact.md](ext-web-artifact.md) §9 |
|
||||
|
||||
---
|
||||
|
||||
|
||||
@@ -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)。
|
||||
|
||||
|
||||
+2182
File diff suppressed because it is too large.
Load diff
+85
-78
@@ -1,19 +1,22 @@
|
||||
# 第 14 章:网络与 Web 扩展
|
||||
|
||||
Marqdo 的网络能力分两层:**标准库 `lib/net`**(HTTP 客户端、cookie / multipart 解析)与**官方扩展 `ext/web`**(网页应用、数据库、表单、登录鉴权、WebSocket)。分层的依据是「代码即文档」的可读性——基础、通用、低依赖的进标准库;领域性强、依赖重、只在 Web 场景才用的进扩展。
|
||||
> **现行作者面(2026-09-28 · ADR 0007)**:Document / Endpoint / Resource —— 见 [ext-web-artifact.md](../design/ext-web-artifact.md)。
|
||||
> 下文若仍出现 `compose_*` / `app.configure` / `web.db` 同文件混写,视为**历史示例**;DB → `ext/data`,鉴权 → `ext/security`,实时 → `ext/net`。
|
||||
|
||||
Marqdo 的网络能力分两层:**标准库 `lib/net`**(HTTP 客户端、cookie / multipart 解析)与**官方扩展 `ext/web`**(Document/Endpoint facade + 拆分后的 data/security/net)。分层的依据是「代码即文档」。
|
||||
|
||||
## 14.1 概览
|
||||
|
||||
| 能力 | 位置 | 典型函数 |
|
||||
| 能力 | 位置 | 典型 API |
|
||||
|------|------|----------|
|
||||
| HTTP(S) 客户端 | `lib/net` | `http_get` / `http_post` / `http_request` |
|
||||
| Cookie 解析 | `lib/net` | `cookie_parse` |
|
||||
| multipart/form-data 解析 | `lib/net` | `multipart_parse` |
|
||||
| 网页应用 / 路由 / 静态 | `ext/web` | `web.page` / `web.app` |
|
||||
| SQLite 数据库 | `ext/web` | `web.db` |
|
||||
| 表单 | `ext/web` | `web.form` |
|
||||
| 登录鉴权(session) | `ext/web` | `web.auth` / `app.auth` |
|
||||
| WebSocket 客户端 / 端点 | `ext/web` | `web.ws` / `app.route_ws` |
|
||||
| Cookie / multipart | `lib/net` | `cookie_parse` / `multipart_parse` |
|
||||
| Document / Endpoint | `ext/web` | `type: web\|endpoint` · `web.serve` · `web.render` · `web.inspect` |
|
||||
| View 装配 | `ext/web` | `|type|slot|value|attrs|style|` → `web.render` |
|
||||
| 数据库 | `ext/data` | `db` CRUD / txn |
|
||||
| 表单 | `ext/data` | `form` |
|
||||
| 鉴权 / RBAC / OIDC | `ext/security` | `auth` · `rbac` · `oidc` |
|
||||
| WebSocket | `ext/net` | `websocket` |
|
||||
|
||||
```bash
|
||||
# 运行使用 ext/web 的程序前,先安装扩展
|
||||
@@ -67,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="<h1>你好</h1>"**
|
||||
**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`
|
||||
|
||||
|
||||
@@ -1,54 +1,39 @@
|
||||
# examples/marqdo-blog
|
||||
|
||||
一个用 Marqdo 的 `ext/web` 网络扩展库搭建的博客系统示例:美观大气的现代化主题、
|
||||
SQLite 驱动的文章/标签、动态路由、WebSocket 实时终端、以及受会话门禁保护的后台 CRUD。
|
||||
Marqdo **Web Artifact** blog (ADR 0007).
|
||||
|
||||
## 运行
|
||||
## Layout
|
||||
|
||||
```bash
|
||||
cargo build -p marqdo_plugin_web
|
||||
cargo run -- examples/marqdo-blog/index.mq.md
|
||||
```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
|
||||
```
|
||||
|
||||
打开 http://127.0.0.1:18085/:
|
||||
|
||||
- `/` — 首页:文章卡片网格 + 实时 WebSocket 终端
|
||||
- `/post/{slug}` — 动态路由渲染单篇文章(标题/日期/标签/正文)
|
||||
- `/tags` — 标签归档;`/tag/{slug}` 查看某标签下的文章
|
||||
- `/about` — 关于页
|
||||
- `/admin` — 会话门禁后台,登录 `admin` / `marqdo`,可增删改文章与标签
|
||||
- `/live` — WebSocket 回显端点
|
||||
- `/static/*` — 静态资源(`public/` 下的 `live.js`、favicon、logo)
|
||||
- `/favicon.ico` — 站点图标(`应用.图标` 表装配)
|
||||
|
||||
## 设计亮点(文档即代码)
|
||||
|
||||
- **样式即数据表格,装配即函数**(`styles/theme.mq.md`):
|
||||
主题不再是一大段手写 CSS 字符串,而是由一张张 GFM 样式表组成 ——
|
||||
`|选择器|属性|值|` 规则行(同一选择器多行自动合并成一条规则),
|
||||
响应式用 `|媒体|选择器|属性|值|` 分组进 `@media` 块。
|
||||
每个 `## 段`(基础/顶栏/侧栏/主体/卡片/页脚/表单/响应式)导出一张样式表,
|
||||
`## 全局` 用 `网页.样式装配` 函数把每张表装配成 CSS 文本,再 `text.str_join` 拼成完整样式表,
|
||||
最后经 `页面.样式` 注入页面。样式保持可读的数据表格,不写胶水代码。
|
||||
- **图标 / 头资源 / 图片装配**(W8):`应用.图标` 表挂 `/favicon.ico` 与 SVG;
|
||||
`页面.头装配` 写 apple-touch-icon;`页面.图片装配` 把 logo 表注入主区(`mq-images`)。
|
||||
含 `/` 的路径与 MIME 单元格需加引号(如 `"/static/logo.svg"`、`"image/png"`)。
|
||||
- **页面 = 组件装配 + 主体绑定**(`index.mq.md`):
|
||||
导航/侧栏/页脚用 `|组件|样式|` 表装配,文章列表用 `|属性|值|` 绑定 SQLite 字段。
|
||||
- **动态路由**:`/post/{slug}` 的 `slug` 注入查询条件,`页面.详情` 把首行渲染成文章。
|
||||
- **数据模型**(`db/`):`schema.mq.md` 定义 `posts`/`tags`/`post_tags` 三张表,
|
||||
`seed.mq.md` 提供种子数据,`index.mq.md` 幂等建表 + 灌数据。
|
||||
|
||||
## 冒烟测试
|
||||
|
||||
服务器启动后(端口 18085),运行:
|
||||
## Run
|
||||
|
||||
```bash
|
||||
bash scripts/build-web-plugin.sh
|
||||
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
|
||||
```
|
||||
|
||||
覆盖:首页/卡片/主题 CSS/媒体查询、静态资源、动态路由详情、标签归档、鉴权门禁、
|
||||
登录会话、后台表单、WebSocket 回显。全部通过时输出 `通过 N / N`。
|
||||
| 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 |
|
||||
|
||||
可从仓库根目录或本目录运行:相对 `static_dir`(`public`)与相对数据库路径
|
||||
(`data/marqdo-blog.db`)都按**入口脚本所在目录**解析,不依赖终端工作目录。
|
||||
Design: [ext-web-artifact.md](../../doc/design/ext-web-artifact.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*
|
||||
@@ -0,0 +1,19 @@
|
||||
---
|
||||
type: endpoint
|
||||
method: GET
|
||||
path: /api/ping
|
||||
request: none
|
||||
response: json
|
||||
auth: none
|
||||
description: Health ping — documentation is the API (ADR 0007).
|
||||
---
|
||||
|
||||
# main
|
||||
|
||||
`out` =
|
||||
|
||||
| ok | service |
|
||||
|----|---------|
|
||||
| True | marqdo-blog |
|
||||
|
||||
*out*
|
||||
@@ -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*
|
||||
@@ -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*
|
||||
@@ -1,131 +1,15 @@
|
||||
---
|
||||
type: web
|
||||
title: Marqdo 博客
|
||||
description: 用 web 扩展库搭建的博客系统示例:首页列表、动态文章详情、标签归档、登录门禁后台。
|
||||
route: /
|
||||
method: GET
|
||||
data_source: posts
|
||||
data_order: -created_at
|
||||
description: >-
|
||||
Document Artifact 首页(ADR 0007):正文即文档,列表来自 data_source。
|
||||
导入 网页:ext/web/网页.mq.md
|
||||
import theme:styles/theme.mq.md
|
||||
import nav:components/nav.mq.md
|
||||
import side:components/side.mq.md
|
||||
import foot:components/foot.mq.md
|
||||
import db:db/index.mq.md
|
||||
---
|
||||
|
||||
# main
|
||||
# Marqdo 博客
|
||||
|
||||
`首页` =
|
||||
|
||||
| 组件 | 样式 |
|
||||
|------|------|
|
||||
| nav.`导航` | |
|
||||
| side.`侧栏` | |
|
||||
| foot.`页脚` | |
|
||||
|
||||
`列表` =
|
||||
|
||||
| 属性 | 值 | 样式 |
|
||||
|------|-----|------|
|
||||
| title | posts.title | |
|
||||
| body | posts.summary | |
|
||||
| meta | posts.created_at | |
|
||||
| tag | posts.tag | |
|
||||
| href | posts.slug | |
|
||||
|
||||
`详情绑定` =
|
||||
|
||||
| 属性 | 值 | 样式 |
|
||||
|------|-----|------|
|
||||
| title | posts.title | |
|
||||
| meta | posts.created_at | |
|
||||
| tag | posts.tag | |
|
||||
| body | posts.content | |
|
||||
|
||||
`标签列表` =
|
||||
|
||||
| 属性 | 值 | 样式 |
|
||||
|------|-----|------|
|
||||
| title | tags.name | |
|
||||
| meta | 点击查看该标签下的文章 | |
|
||||
| href | tags.slug | |
|
||||
|
||||
`文章条件` =
|
||||
|
||||
| 字段 | 操作 | 值 |
|
||||
|------|------|-----|
|
||||
| slug | = | {slug} |
|
||||
|
||||
`标签条件` =
|
||||
|
||||
| 字段 | 操作 | 值 |
|
||||
|------|------|-----|
|
||||
| tag | = | {slug} |
|
||||
|
||||
`管理员` =
|
||||
|
||||
| 行 | 用户名 | 密码 |
|
||||
|----|--------|------|
|
||||
| 1 | admin | marqdo |
|
||||
|
||||
`站点图标` =
|
||||
|
||||
| 路径 | 关系 | 类型 | 尺寸 | 地址 |
|
||||
|------|------|------|------|------|
|
||||
| "public/favicon.png" | icon | "image/png" | 32x32 | "/favicon.ico" |
|
||||
| "public/favicon.svg" | icon | "image/svg+xml" | any | "/static/favicon.svg" |
|
||||
|
||||
`头资源` =
|
||||
|
||||
| 关系 | 地址 | 类型 |
|
||||
|------|------|------|
|
||||
| apple-touch-icon | "/static/favicon.png" | "image/png" |
|
||||
|
||||
`品牌图` =
|
||||
|
||||
| 源 | 替代 | 类 | 链接 | 宽度 | 加载 |
|
||||
|----|------|----|------|------|------|
|
||||
| "/static/logo.svg" | Marqdo | brand-logo | "/" | 40 | eager |
|
||||
|
||||
**store = > db.打开**
|
||||
|
||||
**首页CSS = > theme.全局**
|
||||
|
||||
**page = > 网页.页面 标题="Marqdo 博客" 引言="<h1>Marqdo 博客</h1><p>用 web 扩展库搭建的博客:表格装配页面、SQLite 数据、动态路由、实时终端。</p><h2 id=\"live\">实时终端</h2><p id=\"live-status\" class=\"live-pill\">connecting…</p><input id=\"live-msg\" placeholder=\"输入一条消息…\"><button id=\"live-send\" disabled>发送</button><div id=\"live-out\"></div><script src=\"/static/live.js\"></script>"**
|
||||
**page = > page.组件装配 组件=`首页`**
|
||||
**page = > page.主体装配 主体=`列表`**
|
||||
**page = > page.排序 排序="-created_at"**
|
||||
**page = > page.样式 样式=`首页CSS`**
|
||||
**page = > page.头装配 表=`头资源`**
|
||||
**page = > page.图片装配 表=`品牌图`**
|
||||
|
||||
**about = > 网页.页面 标题="关于" 引言="<h1>关于本站</h1><p>一个用 Marqdo 的 web 扩展库(ext/web)写成的博客系统。</p><p>它演示了:GFM 表格装配导航与侧栏、SQLite 驱动的主体绑定、动态路由 /post/{slug}、标签归档、以及受 session 保护的后台 CRUD。</p>"**
|
||||
**about = > about.组件装配 组件=`首页`**
|
||||
**about = > about.样式 样式=`首页CSS`**
|
||||
|
||||
**post = > 网页.页面 标题="文章"**
|
||||
**post = > post.组件装配 组件=`首页`**
|
||||
**post = > post.主体装配 主体=`详情绑定`**
|
||||
**post = > post.查询条件 条件=`文章条件`**
|
||||
**post = > post.详情 详情=True**
|
||||
**post = > post.样式 样式=`首页CSS`**
|
||||
|
||||
**tags = > 网页.页面 标题="标签归档" 引言="<h1>标签归档</h1><p>点击标签查看该主题下的文章。</p>"**
|
||||
**tags = > tags.组件装配 组件=`首页`**
|
||||
**tags = > tags.主体装配 主体=`标签列表`**
|
||||
**tags = > tags.链接前缀 前缀="/tag/"**
|
||||
**tags = > tags.样式 样式=`首页CSS`**
|
||||
|
||||
**tagged = > 网页.页面 标题="标签"**
|
||||
**tagged = > tagged.组件装配 组件=`首页`**
|
||||
**tagged = > tagged.主体装配 主体=`列表`**
|
||||
**tagged = > tagged.查询条件 条件=`标签条件`**
|
||||
**tagged = > tagged.排序 排序="-created_at"**
|
||||
**tagged = > tagged.样式 样式=`首页CSS`**
|
||||
|
||||
**app = > 网页.应用 页面=page 数据库=store 后台=True 主机="127.0.0.1" 端口=18085**
|
||||
**app = > app.路由 路径="/about" 页面=about**
|
||||
**app = > app.路由 路径="/post/{slug}" 页面=post**
|
||||
**app = > app.路由 路径="/tags" 页面=tags**
|
||||
**app = > app.路由 路径="/tag/{slug}" 页面=tagged**
|
||||
**app = > app.静态 目录="public" 挂载="/static"**
|
||||
**app = > app.图标 表=`站点图标`**
|
||||
**app = > app.路由实时 路径="/live" 回显=True**
|
||||
**app = > app.鉴权 用户表=`管理员` 会话时长=3600**
|
||||
> `app`.监听
|
||||
可执行文档即网页。本站用 Artifact Metadata 声明路由;文章列表由 `data_source: posts` 在服务时加载。
|
||||
@@ -0,0 +1,10 @@
|
||||
---
|
||||
类型: 网页
|
||||
路由: /about
|
||||
方法: GET
|
||||
标题: 关于
|
||||
---
|
||||
|
||||
# 关于 Marqdo
|
||||
|
||||
Marqdo 是可执行文档语言:文档即程序,程序即知识。
|
||||
@@ -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.
|
||||
@@ -0,0 +1,11 @@
|
||||
---
|
||||
title: marqdo-blog serve
|
||||
description: Scan Artifact documents/endpoints and listen (ADR 0007).
|
||||
import web:ext/web/web.mq.md
|
||||
import posts:db/posts.mq.md
|
||||
---
|
||||
|
||||
# main
|
||||
|
||||
**store = > posts.open url="sqlite:data/blog.db"**
|
||||
> web.serve root="." host="127.0.0.1" port=18081 db=`store` static_dir="public"
|
||||
@@ -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 '<title>Marqdo 博客</title>' && 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))"
|
||||
|
||||
@@ -1,20 +1,14 @@
|
||||
# web-client-site(路线 D)
|
||||
# examples/web-client-site
|
||||
|
||||
服务端 `ext/web` + 浏览器 WASM 会话;**作者零业务 JS**。
|
||||
SSR **Document Artifact** + `web.client_embed` auto-mount(零作者 JS)。ADR 0007。
|
||||
|
||||
```bash
|
||||
# 仓库根
|
||||
cargo build -p marqdo --release
|
||||
cargo build --release -p marqdo_plugin_web
|
||||
./target/release/marqdo ext add web
|
||||
|
||||
# 构建 WASM + bridge 到本示例 static/
|
||||
./target/release/marqdo wasm build -o examples/web-client-site/static
|
||||
# 保留 client.mq.md(wasm build 只写入 wasm/bridge)
|
||||
|
||||
cd examples/web-client-site
|
||||
marqdo run index.mq.md
|
||||
# 打开 http://127.0.0.1:18090/
|
||||
bash scripts/build-web-plugin.sh
|
||||
export MARQDO_EXT=$PWD/ext # 若本机 ~/.marqdo/ext 未同步
|
||||
marqdo wasm build -o examples/web-client-site/static
|
||||
cargo run -- run examples/web-client-site/serve.mq.md
|
||||
```
|
||||
|
||||
`index.mq.md` 用 `web.client_embed source="/static/client.mq.md"` 注入自启脚本;交互在 `static/client.mq.md`。
|
||||
- `index.mq.md` — `type: web` 文档页
|
||||
- `serve.mq.md` — `web.serve` + `static_dir`
|
||||
- `static/client.mq.md` — `lib/browser` wire(不变)
|
||||
@@ -1,19 +1,14 @@
|
||||
---
|
||||
title: web-client-site
|
||||
description: SSR shell + client_embed auto-mount; author zero JS (route D)
|
||||
type: web
|
||||
title: Marqdo client site
|
||||
route: /
|
||||
method: GET
|
||||
description: SSR Document + client_embed auto-mount; author zero JS (ADR 0007).
|
||||
import web:ext/web/web.mq.md
|
||||
---
|
||||
|
||||
# main
|
||||
# Marqdo client site
|
||||
|
||||
Server page with a counter UI. Client logic lives in `static/client.mq.md`
|
||||
(loaded by official bridge via `client_embed`).
|
||||
SSR shell with WASM session. Client logic lives in `static/client.mq.md`.
|
||||
|
||||
**`embed` = > web.client_embed bridge="/static/marqdo-bridge.js" wasm="/static/marqdo_wasm.wasm" source="/static/client.mq.md" boot=True**
|
||||
|
||||
**`intro` = "<h1>Marqdo client site</h1><p>SSR + WASM session. No author JS.</p><div id=\"count\">0</div><p><button id=\"bump\" type=\"button\" disabled>Bump</button> <button id=\"reset\" type=\"button\" disabled>Reset</button></p><pre id=\"log\">booting…</pre>" + embed**
|
||||
|
||||
**page = > web.page title="Marqdo client site" intro=intro**
|
||||
**app = > web.app page=page host="127.0.0.1" port=18090**
|
||||
**app = > app.static dir="static" mount="/static"**
|
||||
> `app`.listen
|
||||
To serve with static assets, run `serve.mq.md` in this directory.
|
||||
@@ -0,0 +1,10 @@
|
||||
---
|
||||
title: web-client-site serve
|
||||
import web:ext/web/web.mq.md
|
||||
---
|
||||
|
||||
# main
|
||||
|
||||
**`embed` = > web.client_embed source="/static/client.mq.md"**
|
||||
> print text=embed-ready
|
||||
> web.serve root="." host="127.0.0.1" port=18090 static_dir="static"
|
||||
+1
-1
@@ -1 +1 @@
|
||||
1.1.1
|
||||
1.2.0
|
||||
@@ -0,0 +1,60 @@
|
||||
---
|
||||
title: ext/data/cache
|
||||
description: Cache Resource (ADR 0007).
|
||||
import plugin:lib/plugin.mq.md
|
||||
import sys:lib/sys.mq.md
|
||||
import table:lib/table.mq.md
|
||||
---
|
||||
|
||||
## _load
|
||||
|
||||
**p = > plugin.native_path name="web"**
|
||||
1. `p`
|
||||
> plugin.load path=`p`
|
||||
2. *
|
||||
> print text=ext/data: native web plugin not found
|
||||
> sys.exit code=1
|
||||
****
|
||||
|
||||
# cache
|
||||
+ `url`="memory:"
|
||||
|
||||
Key–value cache. Use `memory:` for in-process (tests / single process) or `redis://host:6379/0` for Redis.
|
||||
|
||||
> _load
|
||||
*> web_cache_new url=`url`*
|
||||
|
||||
## get
|
||||
+ `key`
|
||||
|
||||
**url = [url](self)**
|
||||
*> web_cache_get url=`url` key=`key`*
|
||||
|
||||
## set
|
||||
+ `key`
|
||||
+ `value`
|
||||
+ `ttl`=None
|
||||
|
||||
Optional `ttl` is seconds until expiry.
|
||||
|
||||
**url = [url](self)**
|
||||
*> web_cache_set url=`url` key=`key` value=`value` ttl=`ttl`*
|
||||
|
||||
## del
|
||||
+ `key`
|
||||
|
||||
**url = [url](self)**
|
||||
*> web_cache_del url=`url` key=`key`*
|
||||
|
||||
## exists
|
||||
+ `key`
|
||||
|
||||
**url = [url](self)**
|
||||
*> web_cache_exists url=`url` key=`key`*
|
||||
|
||||
## ttl
|
||||
+ `key`
|
||||
|
||||
**url = [url](self)**
|
||||
*> web_cache_ttl url=`url` key=`key`*
|
||||
|
||||
@@ -0,0 +1,238 @@
|
||||
---
|
||||
title: ext/data/db
|
||||
description: Database Resource — CRUD, txn, migrate, FTS (ADR 0007).
|
||||
import plugin:lib/plugin.mq.md
|
||||
import sys:lib/sys.mq.md
|
||||
import table:lib/table.mq.md
|
||||
---
|
||||
|
||||
## _load
|
||||
|
||||
**p = > plugin.native_path name="web"**
|
||||
1. `p`
|
||||
> plugin.load path=`p`
|
||||
2. *
|
||||
> print text=ext/data: native web plugin not found
|
||||
> sys.exit code=1
|
||||
****
|
||||
|
||||
# db
|
||||
+ `url`="sqlite:site.db"
|
||||
|
||||
Open a database handle. URL schemes: `sqlite:path` (default), `postgres://…` / `postgresql://…` (same CRUD methods).
|
||||
|
||||
> _load
|
||||
*> web_db_new url=`url`*
|
||||
|
||||
## init
|
||||
+ `name`
|
||||
+ `fields`
|
||||
|
||||
Create a table from a schema table. Optional columns: `唯一`/`unique`, `索引`/`index` (creates UNIQUE / INDEX), `外键`/`fk`/`references` (e.g. `posts.id` or `posts(id)`). Columns named `created_at` / `updated_at` are filled automatically on insert/update when present.
|
||||
|
||||
**url = [url](self)**
|
||||
*> web_db_init url=`url` name=`name` fields=`fields`*
|
||||
|
||||
## insert
|
||||
+ `table`
|
||||
+ `rows`
|
||||
+ `txn`=None
|
||||
|
||||
**url = [url](self)**
|
||||
*> web_db_insert url=`url` table=`table` rows=`rows` txn=`txn`*
|
||||
|
||||
## select
|
||||
+ `table`
|
||||
+ `where`=None
|
||||
+ `limit`=200
|
||||
+ `order`=None
|
||||
+ `txn`=None
|
||||
|
||||
Simple filters: one-row map of column→value (AND `=`), or rows `|字段|操作|值|` (`=` `!=` `>` `>=` `<` `<=` `like` `in` `between` `is null`; add `|或|` = `是` to join a row with `OR`). `order` is a column name with optional `-` prefix for descending (`"created_at"`, `"-created_at"`), comma-separated for multiple keys. Pass `txn` to read inside an open transaction. For pages (with a total), use `paginate`.
|
||||
|
||||
**url = [url](self)**
|
||||
**r = > web_db_select url=`url` table=`table` where=`where` limit=`limit` order=`order` offset=None txn=`txn`**
|
||||
*[rows](r)*
|
||||
|
||||
## paginate
|
||||
+ `table`
|
||||
+ `where`=None
|
||||
+ `limit`=200
|
||||
+ `order`=None
|
||||
+ `跳过`=0
|
||||
+ `txn`=None
|
||||
|
||||
Like `select` but returns `{ rows, total }` — the total counts rows matching `where` regardless of `limit`/`跳过`, so you can render `上一页 / 下一页`. Set `跳过` to the number of rows to skip (e.g. page 2 with 10 per page ⇒ `跳过`=10).
|
||||
|
||||
**url = [url](self)**
|
||||
*> web_db_select url=`url` table=`table` where=`where` limit=`limit` order=`order` offset=`跳过` txn=`txn`*
|
||||
|
||||
## get
|
||||
+ `table`
|
||||
+ `id`
|
||||
+ `txn`=None
|
||||
|
||||
**url = [url](self)**
|
||||
*> web_db_get url=`url` table=`table` id=`id` txn=`txn`*
|
||||
|
||||
## update
|
||||
+ `table`
|
||||
+ `id`
|
||||
+ `row`
|
||||
+ `txn`=None
|
||||
|
||||
**url = [url](self)**
|
||||
*> web_db_update url=`url` table=`table` id=`id` row=`row` txn=`txn`*
|
||||
|
||||
## delete
|
||||
+ `table`
|
||||
+ `id`
|
||||
+ `txn`=None
|
||||
|
||||
**url = [url](self)**
|
||||
*> web_db_delete url=`url` table=`table` id=`id` txn=`txn`*
|
||||
|
||||
## exec
|
||||
+ `sql`
|
||||
+ `args`=None
|
||||
+ `txn`=None
|
||||
|
||||
**url = [url](self)**
|
||||
*> web_db_exec url=`url` sql=`sql` args=`args` txn=`txn`*
|
||||
|
||||
## query
|
||||
+ `sql`
|
||||
+ `args`=None
|
||||
+ `txn`=None
|
||||
|
||||
Run bare SQL and return the result set — count / join / group / subqueries. Returns `{ rows, count }`.
|
||||
|
||||
**url = [url](self)**
|
||||
*> web_db_query url=`url` sql=`sql` args=`args` txn=`txn`*
|
||||
|
||||
## count
|
||||
+ `table`
|
||||
+ `where`=None
|
||||
+ `txn`=None
|
||||
|
||||
Count rows matching a `where` filter (same syntax as `select`). Returns a number.
|
||||
|
||||
**url = [url](self)**
|
||||
**r = > web_db_count url=`url` table=`table` where=`where` txn=`txn`**
|
||||
*[count](r)*
|
||||
|
||||
## migrate
|
||||
+ `steps`
|
||||
|
||||
Apply versioned SQL migrations. `steps` is a `|version|sql|` / `|版本|SQL|` table. Applied versions are recorded in `_marqdo_migrations`. Re-running is a no-op for already-applied versions. SQLite only.
|
||||
|
||||
**url = [url](self)**
|
||||
*> web_db_migrate url=`url` steps=`steps`*
|
||||
|
||||
## fts
|
||||
+ `table`
|
||||
+ `columns`
|
||||
+ `name`=None
|
||||
|
||||
Create an FTS5 index on `table` for the listed content columns (CSV string or list). Default FTS name is `{table}_fts`. Keeps the index in sync via triggers. Requires integer `id` PK. SQLite only.
|
||||
|
||||
**url = [url](self)**
|
||||
*> web_db_fts_create url=`url` table=`table` columns=`columns` name=`name`*
|
||||
|
||||
## search
|
||||
+ `table`
|
||||
+ `q`
|
||||
+ `limit`=20
|
||||
+ `name`=None
|
||||
|
||||
Full-text search (`MATCH`) against the FTS5 index from `fts`. Returns `{ rows, count }` with a `rank` column (bm25). SQLite only.
|
||||
|
||||
**url = [url](self)**
|
||||
*> web_db_search url=`url` table=`table` q=`q` limit=`limit` name=`name`*
|
||||
|
||||
## 事务
|
||||
|
||||
Begin a transaction: borrows the pooled connection exclusively and returns a
|
||||
`txn` handle. Write inside it, then `提交` (commit) or `回滚` (roll back).
|
||||
Every statement runs on the same connection, so a batch is atomic.
|
||||
|
||||
**url = [url](self)**
|
||||
*> web_db_begin url=`url`*
|
||||
|
||||
# txn
|
||||
+ `txn`
|
||||
+ `url`
|
||||
|
||||
A transaction handle from `db.事务`. All CRUD here runs on the transaction's
|
||||
connection; finish with `提交` or `回滚`.
|
||||
|
||||
*self*
|
||||
|
||||
## insert
|
||||
+ `table`
|
||||
+ `rows`
|
||||
|
||||
**url = [url](self)**
|
||||
**txn = [txn](self)**
|
||||
*> web_db_insert url=`url` table=`table` rows=`rows` txn=`txn`*
|
||||
|
||||
## select
|
||||
+ `table`
|
||||
+ `where`=None
|
||||
+ `limit`=200
|
||||
+ `order`=None
|
||||
|
||||
Same filters as `db.select`; runs inside the transaction.
|
||||
|
||||
**url = [url](self)**
|
||||
**txn = [txn](self)**
|
||||
**r = > web_db_select url=`url` table=`table` where=`where` limit=`limit` order=`order` offset=None txn=`txn`**
|
||||
*[rows](r)*
|
||||
|
||||
## get
|
||||
+ `table`
|
||||
+ `id`
|
||||
|
||||
**url = [url](self)**
|
||||
**txn = [txn](self)**
|
||||
*> web_db_get url=`url` table=`table` id=`id` txn=`txn`*
|
||||
|
||||
## update
|
||||
+ `table`
|
||||
+ `id`
|
||||
+ `row`
|
||||
|
||||
**url = [url](self)**
|
||||
**txn = [txn](self)**
|
||||
*> web_db_update url=`url` table=`table` id=`id` row=`row` txn=`txn`*
|
||||
|
||||
## delete
|
||||
+ `table`
|
||||
+ `id`
|
||||
|
||||
**url = [url](self)**
|
||||
**txn = [txn](self)**
|
||||
*> web_db_delete url=`url` table=`table` id=`id` txn=`txn`*
|
||||
|
||||
## exec
|
||||
+ `sql`
|
||||
+ `args`=None
|
||||
|
||||
**url = [url](self)**
|
||||
**txn = [txn](self)**
|
||||
*> web_db_exec url=`url` sql=`sql` args=`args` txn=`txn`*
|
||||
|
||||
## 提交
|
||||
|
||||
Commit the transaction and return its connection to the pool.
|
||||
|
||||
**txn = [txn](self)**
|
||||
*> web_db_commit txn=`txn`*
|
||||
|
||||
## 回滚
|
||||
|
||||
Roll the transaction back (undo every write) and return its connection.
|
||||
|
||||
**txn = [txn](self)**
|
||||
*> web_db_rollback txn=`txn`*
|
||||
|
||||
@@ -0,0 +1,67 @@
|
||||
---
|
||||
title: ext/data/form
|
||||
description: Form Resource — fields, validate, submit (ADR 0007).
|
||||
import plugin:lib/plugin.mq.md
|
||||
import sys:lib/sys.mq.md
|
||||
import table:lib/table.mq.md
|
||||
---
|
||||
|
||||
## _load
|
||||
|
||||
**p = > plugin.native_path name="web"**
|
||||
1. `p`
|
||||
> plugin.load path=`p`
|
||||
2. *
|
||||
> print text=ext/data: native web plugin not found
|
||||
> sys.exit code=1
|
||||
****
|
||||
|
||||
# form
|
||||
+ `table`=None
|
||||
+ `action`=insert
|
||||
+ `id`=None
|
||||
|
||||
Field table + rules table; submit writes through `# db`.
|
||||
|
||||
> _load
|
||||
*> web_form_new table=`table` action=`action` id=`id`*
|
||||
|
||||
## fields
|
||||
+ `fields`
|
||||
|
||||
*> web_form_fields form=`self` fields=`fields`*
|
||||
|
||||
## rules
|
||||
+ `rules`
|
||||
|
||||
*> web_form_rules form=`self` rules=`rules`*
|
||||
|
||||
## labels
|
||||
+ `submit`="Submit"
|
||||
+ `cancel`="cancel"
|
||||
+ `cancel_href`=""
|
||||
|
||||
Localized submit / cancel copy for rendered forms.
|
||||
|
||||
*> web_form_labels form=`self` submit=`submit` cancel=`cancel` cancel_href=`cancel_href`*
|
||||
|
||||
## validate
|
||||
+ `rules`=None
|
||||
+ `data`
|
||||
|
||||
*> web_form_validate form=`self` rules=`rules` data=`data`*
|
||||
|
||||
## render
|
||||
+ `id`=form
|
||||
+ `data`=None
|
||||
+ `errors`=None
|
||||
|
||||
*> web_form_render form=`self` id=`id` data=`data` errors=`errors`*
|
||||
|
||||
## submit
|
||||
+ `data`
|
||||
+ `db`
|
||||
|
||||
**url = [url](db)**
|
||||
*> web_form_submit form=`self` data=`data` url=`url`*
|
||||
|
||||
@@ -0,0 +1,86 @@
|
||||
---
|
||||
title: ext/data/storage
|
||||
description: Object storage Resource (ADR 0007).
|
||||
import plugin:lib/plugin.mq.md
|
||||
import sys:lib/sys.mq.md
|
||||
import table:lib/table.mq.md
|
||||
---
|
||||
|
||||
## _load
|
||||
|
||||
**p = > plugin.native_path name="web"**
|
||||
1. `p`
|
||||
> plugin.load path=`p`
|
||||
2. *
|
||||
> print text=ext/data: native web plugin not found
|
||||
> sys.exit code=1
|
||||
****
|
||||
|
||||
# storage
|
||||
+ `url`="file:data/blobs"
|
||||
|
||||
Object storage. `file:dir` stores blobs on disk (offline / gold). `s3://bucket?endpoint=http://127.0.0.1:9000&access_key=…&secret_key=…` talks to MinIO / S3.
|
||||
|
||||
> _load
|
||||
*> web_storage_new url=`url`*
|
||||
|
||||
## put
|
||||
+ `key`
|
||||
+ `body`=None
|
||||
+ `path`=None
|
||||
+ `content_type`="application/octet-stream"
|
||||
|
||||
Provide either `body` (text) or `path` (local file to upload).
|
||||
|
||||
**url = [url](self)**
|
||||
*> web_storage_put url=`url` key=`key` body=`body` path=`path` content_type=`content_type`*
|
||||
|
||||
## get
|
||||
+ `key`
|
||||
|
||||
**url = [url](self)**
|
||||
*> web_storage_get url=`url` key=`key`*
|
||||
|
||||
## delete
|
||||
+ `key`
|
||||
|
||||
**url = [url](self)**
|
||||
*> web_storage_delete url=`url` key=`key`*
|
||||
|
||||
## list
|
||||
+ `prefix`=""
|
||||
|
||||
**url = [url](self)**
|
||||
*> web_storage_list url=`url` prefix=`prefix`*
|
||||
|
||||
# media
|
||||
+ `storage`=None
|
||||
|
||||
Offline helpers for upload validation and saving into `# storage` (also used by HTTP `app.upload`).
|
||||
|
||||
> _load
|
||||
*> web_media_new storage=`storage`*
|
||||
|
||||
## validate
|
||||
+ `filename`
|
||||
+ `content_type`="application/octet-stream"
|
||||
+ `size`
|
||||
+ `max_bytes`=5242880
|
||||
+ `types`=None
|
||||
|
||||
*> web_upload_validate filename=`filename` content_type=`content_type` size=`size` max_bytes=`max_bytes` types=`types`*
|
||||
|
||||
## save
|
||||
+ `path`
|
||||
+ `key`=None
|
||||
+ `content_type`="application/octet-stream"
|
||||
+ `prefix`=uploads/
|
||||
+ `storage`=None
|
||||
|
||||
**st = storage**
|
||||
1. `st` == None
|
||||
**st = [storage](self)**
|
||||
2. *
|
||||
|
||||
*> web_upload_save storage=`st` path=`path` key=`key` content_type=`content_type` prefix=`prefix`*
|
||||
|
||||
@@ -0,0 +1,31 @@
|
||||
---
|
||||
title: ext/net/http
|
||||
description: HTTP primitives surface for Web Runtime (ADR 0007). Prefer Document/Endpoint Artifacts over raw calls.
|
||||
import plugin:lib/plugin.mq.md
|
||||
import sys:lib/sys.mq.md
|
||||
---
|
||||
|
||||
## _load
|
||||
|
||||
**p = > plugin.native_path name="web"**
|
||||
1. `p`
|
||||
> plugin.load path=`p`
|
||||
2. *
|
||||
> print text=ext/net: native web plugin not found
|
||||
> sys.exit code=1
|
||||
****
|
||||
|
||||
## result
|
||||
+ `ok`
|
||||
+ `value`=None
|
||||
+ `error`=None
|
||||
|
||||
Unified Result map `{ok, value, error}`.
|
||||
|
||||
`out` =
|
||||
|
||||
| ok | value | error |
|
||||
|----|-------|-------|
|
||||
| `ok` | `value` | `error` |
|
||||
|
||||
*out*
|
||||
@@ -0,0 +1,9 @@
|
||||
---
|
||||
title: ext/net/url
|
||||
description: URL helpers (stdlib host wrappers). ADR 0007.
|
||||
---
|
||||
|
||||
## encode
|
||||
+ `text`
|
||||
|
||||
*> host_url_encode text=`text`*
|
||||
@@ -0,0 +1,41 @@
|
||||
---
|
||||
title: ext/net/websocket
|
||||
description: WebSocket client Resource (ADR 0007).
|
||||
import plugin:lib/plugin.mq.md
|
||||
import sys:lib/sys.mq.md
|
||||
import table:lib/table.mq.md
|
||||
---
|
||||
|
||||
## _load
|
||||
|
||||
**p = > plugin.native_path name="web"**
|
||||
1. `p`
|
||||
> plugin.load path=`p`
|
||||
2. *
|
||||
> print text=ext/net: native web plugin not found
|
||||
> sys.exit code=1
|
||||
****
|
||||
|
||||
# ws
|
||||
+ `timeout_sec`=30
|
||||
|
||||
WebSocket client helper.
|
||||
|
||||
> _load
|
||||
`out` =
|
||||
|
||||
| timeout_sec | _type |
|
||||
|-------------|-------|
|
||||
| `timeout_sec` | ws |
|
||||
|
||||
*out*
|
||||
|
||||
## connect
|
||||
+ `url`
|
||||
+ `message`=""
|
||||
+ `headers`=None
|
||||
|
||||
Single request–response: connect to `url`, send `message`, collect up to 256 server text replies (each up to 1 MiB), close. Transport errors and timeouts return `{ok:false, error}` instead of looking like an empty successful reply.
|
||||
|
||||
**timeout = [timeout_sec](self)**
|
||||
*> web_ws_connect url=`url` message=`message` headers=`headers` timeout_sec=`timeout`*
|
||||
@@ -0,0 +1,58 @@
|
||||
---
|
||||
title: ext/security/auth
|
||||
description: Auth Resource (ADR 0007).
|
||||
import plugin:lib/plugin.mq.md
|
||||
import sys:lib/sys.mq.md
|
||||
import table:lib/table.mq.md
|
||||
---
|
||||
|
||||
## _load
|
||||
|
||||
**p = > plugin.native_path name="web"**
|
||||
1. `p`
|
||||
> plugin.load path=`p`
|
||||
2. *
|
||||
> print text=ext/security: native web plugin not found
|
||||
> sys.exit code=1
|
||||
****
|
||||
|
||||
# auth
|
||||
+ `users`
|
||||
+ `session_ttl`=3600
|
||||
|
||||
Session/auth helper. Constructs a config object; `login` validates against the users table. To gate `/admin` on this app, use `app.auth users=…` instead.
|
||||
|
||||
> _load
|
||||
*> web_auth_new users=`users` session_ttl=`session_ttl`*
|
||||
|
||||
## login
|
||||
+ `username`
|
||||
+ `password`
|
||||
|
||||
Validate credentials against the users table and create a session. Returns `{ok, session_id, username, role}`.
|
||||
|
||||
**users = [users](self)**
|
||||
**ttl = [session_ttl](self)**
|
||||
*> web_auth_login username=`username` password=`password` users=`users` session_ttl=`ttl`*
|
||||
|
||||
## check
|
||||
+ `session_id`
|
||||
|
||||
Returns `{ok, username, role}` when the session is valid.
|
||||
|
||||
*> web_auth_check session_id=`session_id`*
|
||||
|
||||
## logout
|
||||
+ `session_id`
|
||||
|
||||
Destroy the session.
|
||||
|
||||
*> web_auth_logout session_id=`session_id`*
|
||||
|
||||
## hash_password
|
||||
+ `password`
|
||||
|
||||
Hash a plaintext password for storage in admin user tables (argon2id). Store the returned `hash` in the `password` column; login verifies automatically.
|
||||
|
||||
*> web_password_hash password=`password`*
|
||||
|
||||
@@ -0,0 +1,31 @@
|
||||
---
|
||||
title: ext/security/oidc
|
||||
description: OIDC attach helper for app handles (ADR 0007). Prefer declared auth metadata on Endpoints.
|
||||
import plugin:lib/plugin.mq.md
|
||||
import sys:lib/sys.mq.md
|
||||
---
|
||||
|
||||
## _load
|
||||
|
||||
**p = > plugin.native_path name="web"**
|
||||
1. `p`
|
||||
> plugin.load path=`p`
|
||||
2. *
|
||||
> print text=ext/security: native web plugin not found
|
||||
> sys.exit code=1
|
||||
****
|
||||
|
||||
## attach
|
||||
+ `app`
|
||||
+ `issuer`=None
|
||||
+ `client_id`
|
||||
+ `client_secret`
|
||||
+ `redirect_uri`
|
||||
+ `scopes`="openid profile email"
|
||||
+ `callback_path`=None
|
||||
+ `authorize_url`=None
|
||||
+ `token_url`=None
|
||||
+ `userinfo_url`=None
|
||||
|
||||
> _load
|
||||
*> web_app_oidc app=`app` issuer=`issuer` client_id=`client_id` client_secret=`client_secret` redirect_uri=`redirect_uri` scopes=`scopes` callback_path=`callback_path` authorize_url=`authorize_url` token_url=`token_url` userinfo_url=`userinfo_url`*
|
||||
@@ -0,0 +1,61 @@
|
||||
---
|
||||
title: ext/security/rbac
|
||||
description: RBAC Resource (ADR 0007).
|
||||
import plugin:lib/plugin.mq.md
|
||||
import sys:lib/sys.mq.md
|
||||
import table:lib/table.mq.md
|
||||
---
|
||||
|
||||
## _load
|
||||
|
||||
**p = > plugin.native_path name="web"**
|
||||
1. `p`
|
||||
> plugin.load path=`p`
|
||||
2. *
|
||||
> print text=ext/security: native web plugin not found
|
||||
> sys.exit code=1
|
||||
****
|
||||
|
||||
# rbac
|
||||
|
||||
Offline helpers for role ⊥ permission. Prefer `app.enable_rbac` + gates for HTTP; use these for scripts/tests.
|
||||
|
||||
## can
|
||||
+ `permissions`
|
||||
+ `needed`
|
||||
|
||||
Return `{ok, allowed}` — whether held permission CSV includes any of `needed` (CSV). Held `*` allows all.
|
||||
|
||||
> _load
|
||||
*> web_rbac_can permissions=`permissions` needed=`needed`*
|
||||
|
||||
## assign_role
|
||||
+ `url`
|
||||
+ `username`
|
||||
+ `role`
|
||||
|
||||
Bind `username` (in `web_users`) to role name.
|
||||
|
||||
> _load
|
||||
*> web_rbac_assign_role url=`url` username=`username` role=`role`*
|
||||
|
||||
## create_role
|
||||
+ `url`
|
||||
+ `name`
|
||||
|
||||
Create a non-system role; returns `{ok, id, name}`.
|
||||
|
||||
> _load
|
||||
*> web_rbac_create_role url=`url` name=`name`*
|
||||
|
||||
## set_role_permissions
|
||||
+ `url`
|
||||
+ `role`
|
||||
+ `permissions`
|
||||
+ `grantable`=""
|
||||
|
||||
Replace permissions on a non-system role (CSV). `grantable` restricts grants (anti-escalation); empty = full catalog.
|
||||
|
||||
> _load
|
||||
*> web_rbac_set_role_permissions url=`url` role=`role` permissions=`permissions` grantable=`grantable`*
|
||||
|
||||
+17
-28
@@ -1,31 +1,20 @@
|
||||
# ext/web
|
||||
# ext/web — Document / Endpoint / Resource
|
||||
|
||||
Official dynamic website extension: **GFM tables + class methods**.
|
||||
Design: [`doc/design/ext-web.md`](../../doc/design/ext-web.md).
|
||||
Official dynamic site extension (**ADR 0007**). Design: [`doc/design/ext-web-artifact.md`](../../doc/design/ext-web-artifact.md).
|
||||
|
||||
| Surface | Import | Classes |
|
||||
|---------|--------|---------|
|
||||
| English | `> ext/web/web.mq.md` | `page` · `db` · `app` · `form` · `style` |
|
||||
| Chinese | `> ext/web/网页.mq.md` | `页面` · `数据库` · `应用` · `表单` · `样式` |
|
||||
|
||||
```bash
|
||||
cargo build -p marqdo_plugin_web
|
||||
# optional install into ~/.marqdo/ext
|
||||
marqdo ext add web
|
||||
```
|
||||
|
||||
Canonical sample (design §4): [`examples/web-site/`](../../examples/web-site/).
|
||||
|
||||
```bash
|
||||
cargo run -- run examples/web-site/index.mq.md
|
||||
# http://127.0.0.1:18081/
|
||||
# /_form/article · /admin · /admin/articles/new
|
||||
```
|
||||
|
||||
Offline smokes: `tests/ext/web-smoke.mq.md`, `web-form-smoke.mq.md`, `web-admin-smoke.mq.md`.
|
||||
|
||||
| Feature | Notes |
|
||||
| Surface | Import |
|
||||
|---------|--------|
|
||||
| Form §5.5 | field/rules tables · `validate` · `submit` · `mount_form` → `GET\|POST /_form/{id}` |
|
||||
| Admin CRUD | `admin=True` · schema → same form path · new/edit/delete under `/admin/{table}` |
|
||||
| Route | `` `app`.route path=/about page=`about` `` → `GET /about` |
|
||||
| English | `import web:ext/web/web.mq.md` |
|
||||
| Chinese | `导入 网页:ext/web/网页.mq.md` |
|
||||
|
||||
**Facade:** `page` · `route` · `serve` · `render` · `inspect` · `use`
|
||||
|
||||
**Related modules:** `ext/data` (db/cache/storage) · `ext/security` (auth/oidc/rbac) · `ext/net` (http/websocket/url)
|
||||
|
||||
```bash
|
||||
bash scripts/build-web-plugin.sh
|
||||
marqdo ext add web # optional install
|
||||
marqdo run examples/marqdo-blog/serve.mq.md
|
||||
```
|
||||
|
||||
Hard rules: no author `ensure_plugin` / `compose_*` / `configure` junk drawer; View schema `|type|slot|value|attrs|style|` only; declared vs system routes via `inspect`.
|
||||
@@ -0,0 +1,18 @@
|
||||
---
|
||||
title: ext/web/_capability
|
||||
description: Internal — load native web plugin once. Authors must not call this; import web = capability (ADR 0007).
|
||||
import plugin:lib/plugin.mq.md
|
||||
import sys:lib/sys.mq.md
|
||||
---
|
||||
|
||||
## load
|
||||
|
||||
Load ABI v2 `web` plugin if present. Fail loud when missing.
|
||||
|
||||
**p = > plugin.native_path name="web"**
|
||||
1. `p`
|
||||
> plugin.load path=`p`
|
||||
2. *
|
||||
> print text=ext/web: native web plugin not found (build plugins/web or marqdo ext add web)
|
||||
> sys.exit code=1
|
||||
****
|
||||
@@ -0,0 +1,50 @@
|
||||
---
|
||||
title: ext/web/client
|
||||
description: Browser Runtime helpers (WASM bridge). Prefer lib/browser for effect tables (ADR 0007).
|
||||
import cap:ext/web/_capability.mq.md
|
||||
import table:lib/table.mq.md
|
||||
---
|
||||
|
||||
## embed
|
||||
+ `bridge`="/static/marqdo-bridge.js"
|
||||
+ `wasm`="/static/marqdo_wasm.wasm"
|
||||
+ `source`=""
|
||||
+ `boot`=True
|
||||
|
||||
HTML snippet that loads the official browser Marqdo bridge (route C/D). With `boot` and non-empty `source`, auto-mounts. No author JS.
|
||||
|
||||
> cap.load
|
||||
1. `boot`
|
||||
1. `source` != ""
|
||||
*"<script type=\"module\" src=\"" + bridge + "\" data-mq-wasm=\"" + wasm + "\" data-mq-source-url=\"" + source + "\"></script>"*
|
||||
2. *
|
||||
*"<script type=\"module\" src=\"" + bridge + "\"></script>"*
|
||||
2. *
|
||||
*"<script type=\"module\" src=\"" + bridge + "\" data-mq-no-boot=\"1\"></script>"*
|
||||
|
||||
## text_patch
|
||||
+ `sel`
|
||||
+ `text`
|
||||
|
||||
`set_text` effects map. Prefer `lib/browser` in client `.mq.md`.
|
||||
|
||||
**`m` = > table.put in=None at=sel value=text**
|
||||
*> table.put in=None at="set_text" value=m*
|
||||
|
||||
## dom_patch
|
||||
+ `sel`
|
||||
+ `html`=""
|
||||
+ `attrs`=None
|
||||
+ `remove`=False
|
||||
|
||||
**`spec` = > table.put in=None at="html" value=html**
|
||||
1. `attrs`
|
||||
**`spec` = > table.put in=`spec` at="attrs" value=attrs**
|
||||
2. *
|
||||
**_ = 1**
|
||||
1. `remove`
|
||||
**`spec` = > table.put in=`spec` at="remove" value=True**
|
||||
2. *
|
||||
**_ = 1**
|
||||
**`m` = > table.put in=None at=sel value=spec**
|
||||
*> table.put in=None at="dom" value=m*
|
||||
@@ -0,0 +1,20 @@
|
||||
---
|
||||
title: ext/web/component
|
||||
description: Reusable Document fragments as View node tables (ADR 0007).
|
||||
import table:lib/table.mq.md
|
||||
---
|
||||
|
||||
## nodes
|
||||
+ `table`
|
||||
|
||||
Identity helper — a component is a View table `|type|slot|value|attrs|style|`.
|
||||
|
||||
*table*
|
||||
|
||||
## merge
|
||||
+ `a`
|
||||
+ `b`
|
||||
|
||||
Concatenate two View node lists (list-of-maps or column tables). Prefer authoring one table.
|
||||
|
||||
*> table.concat a=`a` b=`b`*
|
||||
@@ -0,0 +1,38 @@
|
||||
---
|
||||
title: ext/web/dom
|
||||
description: DOM Artifact — Markdown/body to structure; raw HTML is escape hatch only (ADR 0007).
|
||||
import cap:ext/web/_capability.mq.md
|
||||
import table:lib/table.mq.md
|
||||
---
|
||||
|
||||
## from_markdown
|
||||
+ `text`
|
||||
|
||||
Turn Markdown text into a simple DOM map `{kind:"markdown", text}` for `page.render` / `web.render`.
|
||||
|
||||
> cap.load
|
||||
**`out` = > table.put in=None at="kind" value="markdown"**
|
||||
*> table.put in=`out` at="text" value=text*
|
||||
|
||||
## raw
|
||||
+ `html`
|
||||
|
||||
Escape hatch — wrap a raw HTML string. Prefer Markdown / View nodes.
|
||||
|
||||
> cap.load
|
||||
**`out` = > table.put in=None at="kind" value="raw"**
|
||||
*> table.put in=`out` at="html" value=html*
|
||||
|
||||
## render
|
||||
+ `dom`
|
||||
|
||||
Render a DOM Artifact (markdown or raw) to HTML via native plugin.
|
||||
|
||||
> cap.load
|
||||
**kind = [kind](dom)**
|
||||
1. `kind` == "raw"
|
||||
**html = [html](dom)**
|
||||
*html*
|
||||
2. *
|
||||
**text = [text](dom)**
|
||||
*> web_dom_markdown text=`text`*
|
||||
@@ -0,0 +1,54 @@
|
||||
---
|
||||
title: ext/web/page
|
||||
description: Document → View. Sole compose path is render(nodes=) with unified View schema (ADR 0007).
|
||||
import cap:ext/web/_capability.mq.md
|
||||
import table:lib/table.mq.md
|
||||
---
|
||||
|
||||
# page
|
||||
+ `title`=""
|
||||
+ `route`="/"
|
||||
+ `method`="GET"
|
||||
+ `body`=""
|
||||
+ `nodes`=None
|
||||
+ `data_source`=""
|
||||
+ `data_order`=""
|
||||
+ `data_where`=""
|
||||
|
||||
Web Document handle. Prefer constructing from Artifact Metadata via `web.page` facade.
|
||||
View tables use only `|type|slot|value|attrs|style|` (ZH `|类型|槽|值|属性|样式|`).
|
||||
|
||||
> cap.load
|
||||
`out` =
|
||||
|
||||
| _type | title | route | method | body | nodes | data_source | data_order | data_where |
|
||||
|-------|-------|-------|--------|------|-------|-------------|------------|------------|
|
||||
| page | `title` | `route` | `method` | `body` | `nodes` | `data_source` | `data_order` | `data_where` |
|
||||
|
||||
*out*
|
||||
|
||||
## render
|
||||
+ `nodes`=None
|
||||
+ `db`=None
|
||||
|
||||
Render Document to HTML. `nodes` is the unified View table; when omitted, uses `self.nodes` or Markdown `body`.
|
||||
|
||||
> cap.load
|
||||
**n = nodes**
|
||||
1. `n` == None
|
||||
**n = [nodes](self)**
|
||||
2. *
|
||||
**_ = 1**
|
||||
1. `n`
|
||||
*> web_render_nodes page=`self` nodes=`n` db=`db`*
|
||||
2. *
|
||||
**body = [body](self)**
|
||||
*> web_render_document page=`self` body=`body` db=`db`*
|
||||
|
||||
## css
|
||||
+ `css`
|
||||
|
||||
Escape hatch — append raw CSS (not a second primary language).
|
||||
|
||||
> cap.load
|
||||
*> web_page_css page=`self` css=`css`*
|
||||
@@ -0,0 +1,60 @@
|
||||
---
|
||||
title: ext/web/route
|
||||
description: Declared Endpoint / Document route registration (ADR 0007).
|
||||
import cap:ext/web/_capability.mq.md
|
||||
import table:lib/table.mq.md
|
||||
---
|
||||
|
||||
# route
|
||||
+ `app`
|
||||
+ `path`
|
||||
+ `method`="GET"
|
||||
+ `page`=None
|
||||
+ `fn`=""
|
||||
+ `request`="json"
|
||||
+ `response`="json"
|
||||
+ `auth`=""
|
||||
|
||||
Declared route handle. Prefer `web.route` / Artifact `type: endpoint` discovery via `web.serve`.
|
||||
|
||||
> cap.load
|
||||
`out` =
|
||||
|
||||
| _type | app | path | method | page | fn | request | response | auth |
|
||||
|-------|-----|------|--------|------|----|---------|----------|------|
|
||||
| route | `app` | `path` | `method` | `page` | `fn` | `request` | `response` | `auth` |
|
||||
|
||||
*out*
|
||||
|
||||
## use
|
||||
+ `middleware`
|
||||
|
||||
Attach middleware table to this route (`|header|value|` or named capability rows).
|
||||
|
||||
> cap.load
|
||||
*> web_route_use route=`self` middleware=`middleware`*
|
||||
|
||||
## register
|
||||
+ `app`=None
|
||||
|
||||
Register this declared route on an app handle.
|
||||
|
||||
> cap.load
|
||||
**a = app**
|
||||
1. `a` == None
|
||||
**a = [app](self)**
|
||||
2. *
|
||||
**_ = 1**
|
||||
**page = [page](self)**
|
||||
**fn = [fn](self)**
|
||||
1. `page`
|
||||
**path = [path](self)**
|
||||
*> web_app_route app=`a` path=`path` page=`page`*
|
||||
2. `fn`
|
||||
**path = [path](self)**
|
||||
**method = [method](self)**
|
||||
**request = [request](self)**
|
||||
**response = [response](self)**
|
||||
*> web_app_invoke app=`a` path=`path` method=`method` fn=`fn` body=`request` return=`response`*
|
||||
3. *
|
||||
*> table.put in=None at="ok" value=False*
|
||||
+94
-1091
File diff suppressed because it is too large.
Load diff
+47
-1113
File diff suppressed because it is too large.
Load diff
@@ -52,6 +52,12 @@ Lookup one metadata key; missing → None.
|
||||
|
||||
*> host_meta_get key=`key`*
|
||||
|
||||
## artifact_kind
|
||||
|
||||
Classify entry Artifact Metadata: `web` / `endpoint` / `prompt` / `other`, or None if no `type`/`类型`. ADR 0007.
|
||||
|
||||
*> host_artifact_kind*
|
||||
|
||||
## module_source
|
||||
|
||||
Entry `.mq.md` source text (for document-as-prompt). Empty string if unset.
|
||||
|
||||
@@ -52,6 +52,12 @@ description: 中文系统包装(加载环境 可选 路径=)
|
||||
|
||||
*> host_meta_get key=`键`*
|
||||
|
||||
## 工件种类
|
||||
|
||||
入口 Artifact 分类:`web` / `endpoint` / `prompt` / `other`;无 `type`/`类型` → None。ADR 0007。
|
||||
|
||||
*> host_artifact_kind*
|
||||
|
||||
## 模块源码
|
||||
|
||||
入口 `.mq.md` 全文(供 document-as-prompt)。未设置时为空文本。
|
||||
|
||||
@@ -0,0 +1,326 @@
|
||||
package main
|
||||
|
||||
/*
|
||||
#cgo CFLAGS: -I${SRCDIR}/abi
|
||||
#include "marqdo_abi_cgo.h"
|
||||
|
||||
extern int web_render_nodes(char *args_json, char **out_json, char **err_msg);
|
||||
extern int web_render_document(char *args_json, char **out_json, char **err_msg);
|
||||
extern int web_dom_markdown(char *args_json, char **out_json, char **err_msg);
|
||||
extern int web_serve_root(char *args_json, char **out_json, char **err_msg);
|
||||
extern int web_inspect(char *args_json, char **out_json, char **err_msg);
|
||||
extern int web_app_use(char *args_json, char **out_json, char **err_msg);
|
||||
extern int web_route_use(char *args_json, char **out_json, char **err_msg);
|
||||
*/
|
||||
import "C"
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"os"
|
||||
"path/filepath"
|
||||
"strconv"
|
||||
"strings"
|
||||
|
||||
"github.com/marqdo/marqdo/plugins/web/internal/app"
|
||||
"github.com/marqdo/marqdo/plugins/web/internal/artifact"
|
||||
"github.com/marqdo/marqdo/plugins/web/internal/httpx"
|
||||
"github.com/marqdo/marqdo/plugins/web/internal/middleware"
|
||||
"github.com/marqdo/marqdo/plugins/web/internal/page"
|
||||
)
|
||||
|
||||
//export web_render_nodes
|
||||
func web_render_nodes(argsJSON *C.char, outJSON **C.char, errMsg **C.char) C.int {
|
||||
args, err := parseArgs(argsJSON)
|
||||
if err != nil {
|
||||
return replyJSON(outJSON, errMsg, nil, err)
|
||||
}
|
||||
frag, err := artifact.RenderNodes(args["nodes"])
|
||||
if err != nil {
|
||||
return replyJSON(outJSON, errMsg, nil, err)
|
||||
}
|
||||
pg := asPageMap(args["page"])
|
||||
title := ""
|
||||
if pg != nil {
|
||||
if t, ok := pg["title"].(string); ok {
|
||||
title = t
|
||||
}
|
||||
}
|
||||
if t, ok := argStr(args, "title"); ok && t != "" {
|
||||
title = t
|
||||
}
|
||||
return replyJSON(outJSON, errMsg, artifact.RenderHTMLPage(title, frag), nil)
|
||||
}
|
||||
|
||||
//export web_render_document
|
||||
func web_render_document(argsJSON *C.char, outJSON **C.char, errMsg **C.char) C.int {
|
||||
args, err := parseArgs(argsJSON)
|
||||
if err != nil {
|
||||
return replyJSON(outJSON, errMsg, nil, err)
|
||||
}
|
||||
pg := asPageMap(args["page"])
|
||||
title := ""
|
||||
body := ""
|
||||
if pg != nil {
|
||||
if t, ok := pg["title"].(string); ok {
|
||||
title = t
|
||||
}
|
||||
if b, ok := pg["body"].(string); ok {
|
||||
body = b
|
||||
}
|
||||
}
|
||||
if b, ok := argStr(args, "body"); ok && b != "" {
|
||||
body = b
|
||||
}
|
||||
if t, ok := argStr(args, "title"); ok && t != "" {
|
||||
title = t
|
||||
}
|
||||
return replyJSON(outJSON, errMsg, artifact.RenderDocument(title, body), nil)
|
||||
}
|
||||
|
||||
//export web_dom_markdown
|
||||
func web_dom_markdown(argsJSON *C.char, outJSON **C.char, errMsg **C.char) C.int {
|
||||
args, err := parseArgs(argsJSON)
|
||||
if err != nil {
|
||||
return replyJSON(outJSON, errMsg, nil, err)
|
||||
}
|
||||
text, _ := argStr(args, "text")
|
||||
return replyJSON(outJSON, errMsg, artifact.MarkdownHTML(text), nil)
|
||||
}
|
||||
|
||||
//export web_serve_root
|
||||
func web_serve_root(argsJSON *C.char, outJSON **C.char, errMsg **C.char) C.int {
|
||||
args, err := parseArgs(argsJSON)
|
||||
if err != nil {
|
||||
return replyJSON(outJSON, errMsg, nil, err)
|
||||
}
|
||||
root, _ := argStr(args, "root")
|
||||
if root == "" {
|
||||
root = "."
|
||||
}
|
||||
abs, err := filepath.Abs(root)
|
||||
if err != nil {
|
||||
return replyJSON(outJSON, errMsg, nil, err)
|
||||
}
|
||||
if st, err := os.Stat(abs); err != nil || !st.IsDir() {
|
||||
return replyJSON(outJSON, errMsg, nil, fmt.Errorf("web.serve: root not a directory: %s", abs))
|
||||
}
|
||||
files, err := artifact.ScanRoot(abs)
|
||||
if err != nil {
|
||||
return replyJSON(outJSON, errMsg, nil, err)
|
||||
}
|
||||
host, _ := argStr(args, "host")
|
||||
if host == "" {
|
||||
host = "127.0.0.1"
|
||||
}
|
||||
port := float64(18081)
|
||||
if v, ok := args["port"]; ok && v != nil {
|
||||
switch t := v.(type) {
|
||||
case float64:
|
||||
port = t
|
||||
case string:
|
||||
if n, e := strconv.Atoi(t); e == nil {
|
||||
port = float64(n)
|
||||
}
|
||||
}
|
||||
}
|
||||
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"]
|
||||
if title == "" {
|
||||
title = f.Meta["标题"]
|
||||
}
|
||||
if title == "" {
|
||||
title = "Marqdo"
|
||||
}
|
||||
homeArgs = map[string]any{
|
||||
"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" {
|
||||
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
|
||||
}
|
||||
// endpoint
|
||||
req := f.Meta["request"]
|
||||
if req == "" {
|
||||
req = f.Meta["请求"]
|
||||
}
|
||||
if req == "" {
|
||||
req = "json"
|
||||
}
|
||||
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})
|
||||
if err != nil {
|
||||
return replyJSON(outJSON, errMsg, nil, err)
|
||||
}
|
||||
a = out
|
||||
}
|
||||
if sd, ok := argStr(args, "static_dir"); ok && sd != "" {
|
||||
out, err := app.Static(a, sd, "/static")
|
||||
if err != nil {
|
||||
return replyJSON(outJSON, errMsg, nil, err)
|
||||
}
|
||||
a = out
|
||||
}
|
||||
a["inspect"] = artifact.InspectBag(a, files)
|
||||
_, err = httpx.Listen(a, abs)
|
||||
return replyJSON(outJSON, errMsg, map[string]any{"ok": true, "value": a["inspect"], "error": nil}, err)
|
||||
}
|
||||
|
||||
//export web_inspect
|
||||
func web_inspect(argsJSON *C.char, outJSON **C.char, errMsg **C.char) C.int {
|
||||
args, err := parseArgs(argsJSON)
|
||||
if err != nil {
|
||||
return replyJSON(outJSON, errMsg, nil, err)
|
||||
}
|
||||
a := asPageMap(args["app"])
|
||||
if a != nil {
|
||||
if insp, ok := a["inspect"].(map[string]any); ok {
|
||||
return replyJSON(outJSON, errMsg, insp, nil)
|
||||
}
|
||||
}
|
||||
return replyJSON(outJSON, errMsg, artifact.InspectBag(a, nil), nil)
|
||||
}
|
||||
|
||||
//export web_app_use
|
||||
func web_app_use(argsJSON *C.char, outJSON **C.char, errMsg **C.char) C.int {
|
||||
args, err := parseArgs(argsJSON)
|
||||
if err != nil {
|
||||
return replyJSON(outJSON, errMsg, nil, err)
|
||||
}
|
||||
a := asPageMap(args["app"])
|
||||
out, err := middleware.Configure(a, map[string]any{"security": args["middleware"]})
|
||||
return replyJSON(outJSON, errMsg, out, err)
|
||||
}
|
||||
|
||||
//export web_route_use
|
||||
func web_route_use(argsJSON *C.char, outJSON **C.char, errMsg **C.char) C.int {
|
||||
args, err := parseArgs(argsJSON)
|
||||
if err != nil {
|
||||
return replyJSON(outJSON, errMsg, nil, err)
|
||||
}
|
||||
rt := asPageMap(args["route"])
|
||||
if rt == nil {
|
||||
rt = map[string]any{}
|
||||
}
|
||||
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/"
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,298 @@
|
||||
// Package artifact implements Document/Endpoint View render, serve scan, and inspect (ADR 0007).
|
||||
package artifact
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"html"
|
||||
"os"
|
||||
"path/filepath"
|
||||
"strings"
|
||||
|
||||
"github.com/marqdo/marqdo/plugins/web/internal/render"
|
||||
"github.com/marqdo/marqdo/plugins/web/internal/table"
|
||||
)
|
||||
|
||||
// MetaType returns canonical kind: web | endpoint | "" from flat frontmatter map.
|
||||
func MetaType(meta map[string]string) string {
|
||||
if v := strings.TrimSpace(meta["type"]); v != "" {
|
||||
return normalizeType(v)
|
||||
}
|
||||
if v := strings.TrimSpace(meta["类型"]); v != "" {
|
||||
return normalizeType(v)
|
||||
}
|
||||
return ""
|
||||
}
|
||||
|
||||
func normalizeType(v string) string {
|
||||
switch v {
|
||||
case "web", "网页":
|
||||
return "web"
|
||||
case "endpoint", "端点":
|
||||
return "endpoint"
|
||||
default:
|
||||
return v
|
||||
}
|
||||
}
|
||||
|
||||
// ParseFrontmatter reads flat key: value pairs from a .mq.md file head.
|
||||
func ParseFrontmatter(src string) (meta map[string]string, body string) {
|
||||
meta = map[string]string{}
|
||||
s := strings.TrimPrefix(src, "\ufeff")
|
||||
if !strings.HasPrefix(s, "---\n") && !strings.HasPrefix(s, "---\r\n") {
|
||||
return meta, src
|
||||
}
|
||||
rest := s[4:]
|
||||
if strings.HasPrefix(rest, "\r\n") {
|
||||
rest = rest[2:]
|
||||
} else if strings.HasPrefix(rest, "\n") {
|
||||
rest = rest[1:]
|
||||
}
|
||||
end := strings.Index(rest, "\n---\n")
|
||||
if end < 0 {
|
||||
end = strings.Index(rest, "\r\n---\r\n")
|
||||
}
|
||||
if end < 0 {
|
||||
end = strings.Index(rest, "\n---\r\n")
|
||||
}
|
||||
if end < 0 {
|
||||
return meta, src
|
||||
}
|
||||
fm := rest[:end]
|
||||
body = rest[end:]
|
||||
if i := strings.Index(body, "---"); i >= 0 {
|
||||
body = body[i+3:]
|
||||
body = strings.TrimPrefix(body, "\r")
|
||||
body = strings.TrimPrefix(body, "\n")
|
||||
}
|
||||
for _, line := range strings.Split(fm, "\n") {
|
||||
line = strings.TrimSpace(strings.TrimSuffix(line, "\r"))
|
||||
if line == "" || strings.HasPrefix(line, "#") || strings.HasPrefix(line, "import ") || strings.HasPrefix(line, "导入 ") {
|
||||
continue
|
||||
}
|
||||
k, v, ok := strings.Cut(line, ":")
|
||||
if !ok {
|
||||
continue
|
||||
}
|
||||
k = strings.TrimSpace(k)
|
||||
v = strings.TrimSpace(v)
|
||||
if len(v) >= 2 {
|
||||
if (v[0] == '"' && v[len(v)-1] == '"') || (v[0] == '\'' && v[len(v)-1] == '\'') {
|
||||
v = v[1 : len(v)-1]
|
||||
}
|
||||
}
|
||||
if k != "" {
|
||||
meta[k] = v
|
||||
}
|
||||
}
|
||||
return meta, body
|
||||
}
|
||||
|
||||
// RenderNodes turns a unified View table into an HTML fragment.
|
||||
// Columns: type|slot|value|attrs|style (ZH: 类型|槽|值|属性|样式).
|
||||
func RenderNodes(nodes any) (string, error) {
|
||||
raw := table.AsRows(nodes)
|
||||
list, _ := raw.([]any)
|
||||
var b strings.Builder
|
||||
b.WriteString(`<div class="mq-view">`)
|
||||
for _, item := range list {
|
||||
row, ok := item.(map[string]any)
|
||||
if !ok {
|
||||
continue
|
||||
}
|
||||
ty := first(row, "type", "类型")
|
||||
slot := first(row, "slot", "槽")
|
||||
val := first(row, "value", "值")
|
||||
attrs := first(row, "attrs", "属性")
|
||||
style := first(row, "style", "样式")
|
||||
class := "mq-node"
|
||||
if style != "" {
|
||||
class += " " + html.EscapeString(style)
|
||||
}
|
||||
if slot != "" {
|
||||
class += " slot-" + html.EscapeString(slot)
|
||||
}
|
||||
switch strings.ToLower(ty) {
|
||||
case "title", "标题":
|
||||
b.WriteString(`<h1 class="` + class + `">` + inline(val) + `</h1>`)
|
||||
case "link", "链接":
|
||||
href := attrs
|
||||
if href == "" {
|
||||
href = "#"
|
||||
}
|
||||
b.WriteString(`<a class="` + class + `" href="` + html.EscapeString(href) + `">` + inline(val) + `</a>`)
|
||||
case "html", "原文":
|
||||
b.WriteString(`<div class="` + class + `">` + val + `</div>`)
|
||||
default: // text
|
||||
b.WriteString(`<p class="` + class + `">` + inline(val) + `</p>`)
|
||||
}
|
||||
}
|
||||
b.WriteString(`</div>`)
|
||||
return b.String(), nil
|
||||
}
|
||||
|
||||
func inline(s string) string {
|
||||
return html.EscapeString(s)
|
||||
}
|
||||
|
||||
func first(row map[string]any, keys ...string) string {
|
||||
for _, k := range keys {
|
||||
if v, ok := row[k]; ok && v != nil {
|
||||
return fmt.Sprint(v)
|
||||
}
|
||||
}
|
||||
return ""
|
||||
}
|
||||
|
||||
// RenderDocument builds a minimal HTML page from title + markdown body.
|
||||
func RenderDocument(title, body string) string {
|
||||
return RenderHTMLPage(title, render.MarkdownToHTML(body))
|
||||
}
|
||||
|
||||
// RenderHTMLPage wraps an HTML fragment in a minimal document shell.
|
||||
func RenderHTMLPage(title, innerHTML string) string {
|
||||
t := html.EscapeString(title)
|
||||
if t == "" {
|
||||
t = "Marqdo"
|
||||
}
|
||||
return "<!DOCTYPE html><html><head><meta charset=\"utf-8\"><title>" + t +
|
||||
"</title></head><body class=\"mq-document\"><main>" + innerHTML + "</main></body></html>"
|
||||
}
|
||||
|
||||
// MarkdownHTML exposes render helper.
|
||||
func MarkdownHTML(md string) string {
|
||||
return render.MarkdownToHTML(md)
|
||||
}
|
||||
|
||||
// ScanRoot finds Artifact .mq.md files under root.
|
||||
func ScanRoot(root string) ([]ArtifactFile, error) {
|
||||
var out []ArtifactFile
|
||||
err := filepath.WalkDir(root, func(path string, d os.DirEntry, err error) error {
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
name := d.Name()
|
||||
if d.IsDir() {
|
||||
if name == "data" || name == ".git" || name == "node_modules" || strings.HasPrefix(name, ".") {
|
||||
return filepath.SkipDir
|
||||
}
|
||||
return nil
|
||||
}
|
||||
if !strings.HasSuffix(name, ".mq.md") {
|
||||
return nil
|
||||
}
|
||||
raw, err := os.ReadFile(path)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
meta, body := ParseFrontmatter(string(raw))
|
||||
kind := MetaType(meta)
|
||||
if kind != "web" && kind != "endpoint" {
|
||||
return nil
|
||||
}
|
||||
rel, _ := filepath.Rel(root, path)
|
||||
af := ArtifactFile{Path: path, Rel: rel, Kind: kind, Meta: meta, Body: body}
|
||||
if kind == "web" {
|
||||
af.Route = metaString(meta, "route", "路由")
|
||||
if af.Route == "" {
|
||||
af.Route = routeFromRel(rel)
|
||||
}
|
||||
af.Method = metaString(meta, "method", "方法")
|
||||
if af.Method == "" {
|
||||
af.Method = "GET"
|
||||
}
|
||||
} else {
|
||||
af.Route = metaString(meta, "path", "路径")
|
||||
af.Method = metaString(meta, "method", "方法")
|
||||
if af.Method == "" {
|
||||
af.Method = "GET"
|
||||
}
|
||||
if af.Route == "" {
|
||||
return fmt.Errorf("endpoint %s: missing path/路径", rel)
|
||||
}
|
||||
}
|
||||
out = append(out, af)
|
||||
return nil
|
||||
})
|
||||
return out, err
|
||||
}
|
||||
|
||||
// ArtifactFile is one discovered Document or Endpoint.
|
||||
type ArtifactFile struct {
|
||||
Path string
|
||||
Rel string
|
||||
Kind string
|
||||
Route string
|
||||
Method string
|
||||
Meta map[string]string
|
||||
Body string
|
||||
}
|
||||
|
||||
func metaString(meta map[string]string, keys ...string) string {
|
||||
for _, k := range keys {
|
||||
if v := strings.TrimSpace(meta[k]); v != "" {
|
||||
return v
|
||||
}
|
||||
}
|
||||
return ""
|
||||
}
|
||||
|
||||
func routeFromRel(rel string) string {
|
||||
rel = filepath.ToSlash(rel)
|
||||
if rel == "index.mq.md" {
|
||||
return "/"
|
||||
}
|
||||
rel = strings.TrimSuffix(rel, ".mq.md")
|
||||
rel = strings.TrimSuffix(rel, "/index")
|
||||
if !strings.HasPrefix(rel, "/") {
|
||||
rel = "/" + rel
|
||||
}
|
||||
return rel
|
||||
}
|
||||
|
||||
// SystemRoutes lists runtime-owned routes for inspect.
|
||||
func SystemRoutes() []map[string]any {
|
||||
return []map[string]any{
|
||||
{"method": "GET", "path": "/_part/*", "kind": "system"},
|
||||
{"method": "GET|POST", "path": "/_form/*", "kind": "system"},
|
||||
}
|
||||
}
|
||||
|
||||
// InspectBag builds {declared, system} from an app bag and/or scanned files.
|
||||
func InspectBag(app map[string]any, declared []ArtifactFile) map[string]any {
|
||||
var dec []map[string]any
|
||||
for _, a := range declared {
|
||||
dec = append(dec, map[string]any{
|
||||
"method": a.Method,
|
||||
"path": a.Route,
|
||||
"kind": a.Kind,
|
||||
"file": a.Rel,
|
||||
})
|
||||
}
|
||||
if app != nil {
|
||||
if routes, ok := app["routes"].(map[string]any); ok {
|
||||
for path := range routes {
|
||||
dec = append(dec, map[string]any{"method": "GET", "path": path, "kind": "declared"})
|
||||
}
|
||||
}
|
||||
if inv, ok := app["invoke_routes"].(map[string]any); ok {
|
||||
for key := range inv {
|
||||
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,
|
||||
"system": SystemRoutes(),
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,55 @@
|
||||
package artifact
|
||||
|
||||
import "testing"
|
||||
|
||||
func TestMetaType(t *testing.T) {
|
||||
if MetaType(map[string]string{"type": "web"}) != "web" {
|
||||
t.Fatal("en web")
|
||||
}
|
||||
if MetaType(map[string]string{"类型": "网页"}) != "web" {
|
||||
t.Fatal("zh web")
|
||||
}
|
||||
if MetaType(map[string]string{"type": "endpoint"}) != "endpoint" {
|
||||
t.Fatal("endpoint")
|
||||
}
|
||||
}
|
||||
|
||||
func TestParseFrontmatter(t *testing.T) {
|
||||
src := "---\ntype: web\nroute: /x\n---\n\n# Hi\n"
|
||||
meta, body := ParseFrontmatter(src)
|
||||
if meta["type"] != "web" || meta["route"] != "/x" {
|
||||
t.Fatalf("meta=%v", meta)
|
||||
}
|
||||
if body == "" || body[0] != '#' {
|
||||
t.Fatalf("body=%q", body)
|
||||
}
|
||||
}
|
||||
|
||||
func TestRenderNodes(t *testing.T) {
|
||||
nodes := map[string]any{
|
||||
"type": []any{"title", "text"},
|
||||
"slot": []any{"title", "lede"},
|
||||
"value": []any{"Marqdo", "Hello"},
|
||||
"attrs": []any{"", ""},
|
||||
"style": []any{"title", "lede"},
|
||||
}
|
||||
html, err := RenderNodes(nodes)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if !contains(html, "Marqdo") || !contains(html, "mq-view") {
|
||||
t.Fatalf("html=%s", html)
|
||||
}
|
||||
}
|
||||
|
||||
func contains(s, sub string) bool {
|
||||
return len(s) >= len(sub) && (s == sub || len(sub) == 0 ||
|
||||
(func() bool {
|
||||
for i := 0; i+len(sub) <= len(s); i++ {
|
||||
if s[i:i+len(sub)] == sub {
|
||||
return true
|
||||
}
|
||||
}
|
||||
return false
|
||||
})())
|
||||
}
|
||||
@@ -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
|
||||
|
||||
@@ -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)
|
||||
}
|
||||
}
|
||||
@@ -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
|
||||
}
|
||||
@@ -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": "<p>hi</p>",
|
||||
"data_source": "posts",
|
||||
"order": "-id",
|
||||
"link_prefix": "/post/",
|
||||
}
|
||||
intro, items, _ := resolveMain(page, url)
|
||||
if intro != "<p>hi</p>" {
|
||||
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))])
|
||||
}
|
||||
}
|
||||
@@ -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
|
||||
|
||||
+14
-10
@@ -158,6 +158,13 @@ extern int web_cache_ttl(char *args_json, char **out_json, char **err_msg);
|
||||
extern int web_app_proxy(char *args_json, char **out_json, char **err_msg);
|
||||
extern int web_app_invoke(char *args_json, char **out_json, char **err_msg);
|
||||
extern int web_api_key_check(char *args_json, char **out_json, char **err_msg);
|
||||
extern int web_render_nodes(char *args_json, char **out_json, char **err_msg);
|
||||
extern int web_render_document(char *args_json, char **out_json, char **err_msg);
|
||||
extern int web_dom_markdown(char *args_json, char **out_json, char **err_msg);
|
||||
extern int web_serve_root(char *args_json, char **out_json, char **err_msg);
|
||||
extern int web_inspect(char *args_json, char **out_json, char **err_msg);
|
||||
extern int web_app_use(char *args_json, char **out_json, char **err_msg);
|
||||
extern int web_route_use(char *args_json, char **out_json, char **err_msg);
|
||||
|
||||
static int register_core(void) {
|
||||
if (host_register((char *)"web_go_ready", (char *)"", web_go_ready) != 0) return 1;
|
||||
@@ -169,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;
|
||||
@@ -269,6 +266,13 @@ static int register_core(void) {
|
||||
if (host_register((char *)"web_app_proxy", (char *)"app,path,upstream,stream,strip_prefix,methods,headers_from_env,timeout_ms", web_app_proxy) != 0) return 1;
|
||||
if (host_register((char *)"web_app_invoke", (char *)"app,path,method,fn,body,return", web_app_invoke) != 0) return 1;
|
||||
if (host_register((char *)"web_api_key_check", (char *)"key,authorization,pepper,keys", web_api_key_check) != 0) return 1;
|
||||
if (host_register((char *)"web_render_nodes", (char *)"page,nodes,db,title", web_render_nodes) != 0) return 1;
|
||||
if (host_register((char *)"web_render_document", (char *)"page,body,db,title", web_render_document) != 0) return 1;
|
||||
if (host_register((char *)"web_dom_markdown", (char *)"text", web_dom_markdown) != 0) return 1;
|
||||
if (host_register((char *)"web_serve_root", (char *)"root,host,port,db,static_dir,middleware", web_serve_root) != 0) return 1;
|
||||
if (host_register((char *)"web_inspect", (char *)"app", web_inspect) != 0) return 1;
|
||||
if (host_register((char *)"web_app_use", (char *)"app,middleware", web_app_use) != 0) return 1;
|
||||
if (host_register((char *)"web_route_use", (char *)"route,middleware", web_route_use) != 0) return 1;
|
||||
return 0;
|
||||
}
|
||||
*/
|
||||
|
||||
+5
-33
@@ -164,44 +164,16 @@ APIs: `# agent` / `# 智能体` → `## step` / `## plan`. Context: standing + t
|
||||
|
||||
Examples: [agent-pong](../../examples/agent-pong/) · [agent-okf-flywheel](../../examples/agent-okf-flywheel/). Harness: `scripts/agent-harness.sh`. Design: [ext-agent.md](../../doc/design/ext-agent.md) · Wave B: [agent-framework-2026-09.md](../../doc/research/agent-framework-2026-09.md). Dev LLM: copy [.env.example](../../.env.example) → `.env` (gitignored).
|
||||
|
||||
## Official extension: `ext/web` (dynamic sites)
|
||||
## Official extension: `ext/web` (Document / Endpoint / Resource)
|
||||
|
||||
Install: `marqdo ext add web` (ZH id: `网页`). Build native plugin first: `cargo build --release -p marqdo_plugin_web`.
|
||||
Install: `marqdo ext add web` (ZH id: `网页`). See ADR 0007 · [ext-web-artifact.md](../../doc/design/ext-web-artifact.md).
|
||||
|
||||
Import **one language file** — never mix EN/ZH API names in the same `.mq.md`:
|
||||
**Do not degrade:** Document/Endpoint metadata; facade `web.page|route|serve|render|inspect`; View `|type|slot|value|attrs|style|` only; no `compose_*` / `configure` / author `ensure_plugin`. DB → `ext/data`; auth → `ext/security`; net → `ext/net`.
|
||||
|
||||
- EN: `import web:ext/web/web.mq.md`
|
||||
- ZH: `导入 网页:ext/web/网页.mq.md`
|
||||
|
||||
**Hard rules (web):**
|
||||
|
||||
- Authors use **GFM tables + `#` classes** — no `json.parse` / `json.set` glue, no hand-built part JSON.
|
||||
- Table cells stay **literal strings**; path text like `` `posts`.`title` `` is resolved by web classes.
|
||||
- **Quote path/MIME cells** that contain `/` (T5 cell expressions treat bare `/` as division): `"/static/logo.svg"`, `"image/png"`.
|
||||
- **`ext/**` never calls `host_*`** — hot path is native `plugins/web` ABI.
|
||||
- HTTPS: terminate at reverse proxy; set `cookie_secure=True` on auth (no in-process TLS).
|
||||
|
||||
**Typical layout:**
|
||||
|
||||
```text
|
||||
index.mq.md # entry + home page table + listen
|
||||
pages/ # sub-pages
|
||||
components/ # reusable |属性|值|样式| tables
|
||||
styles/ # CSS modules
|
||||
public/ # static + favicon.ico|png|svg
|
||||
db/ # schema + open/init
|
||||
data/ # sqlite runtime (gitignore)
|
||||
```
|
||||
|
||||
**Core objects (EN / ZH):** `# page`/`页面`, `# style`/`样式`, `# db`/`数据库`, `# form`/`表单`, `# app`/`应用`, `# auth`/`鉴权`, `# cache`/`缓存`, `# storage`/`存储`.
|
||||
|
||||
**Typical flow:** `db.init` → `page.compose_*` → `app` + `static` / `listen`. Client: `marqdo wasm build -o static` + `web.client_embed source="/static/client.mq.md"` — **no author JS**; bridge may implement rich host effects ([browser-wasm-e.md](../../doc/roadmap/browser-wasm-e.md) · [browser-app](../../examples/browser-app/)).
|
||||
|
||||
**Shipped surface (W0–W7 + P3 + W8 + route D mount):** middleware + JSON API (`app.configure`); transactions, pagination, FTS search (`db.migrate`, `db.fts`, `db.search`); security (argon2, CSRF, SQLite sessions, login rate limit); SEO / RSS / Markdown (`page.meta`, `route_rss`, `lib/net.markdown_parse`); upload / download / gallery; sitemap / robots / error pages / redirects; RBAC (`app.gate`, user `role`); audit timestamps + FK in `db.init`; ETag on downloads; **W8** site icons (`app.icons` → `/favicon.ico`), head resource tables (`page.head`), image assembly (`make_images` / `page.images`); **D** `client_embed` auto-mount + DOM effect helpers (`text_patch` / `dom_patch`).
|
||||
|
||||
Design: [ext-web.md](../../doc/design/ext-web.md) · assets: [web-assets-and-images.md](../../doc/design/web-assets-and-images.md) · capability matrix: [web-net-capabilities.md](../../doc/design/web-net-capabilities.md) · example: [examples/marqdo-blog/](../../examples/marqdo-blog/) · client: [examples/web-client-site/](../../examples/web-client-site/).
|
||||
|
||||
Web patterns: [examples.md](examples.md) §13 · API index: [reference.md](reference.md).
|
||||
Design: [ext-web-artifact.md](../../doc/design/ext-web-artifact.md) · example: [examples/marqdo-blog/](../../examples/marqdo-blog/).
|
||||
|
||||
## Official extension: `ext/quantum` (circuits + Q7/Q8)
|
||||
|
||||
@@ -249,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` 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 |
|
||||
|
||||
+22
-28
@@ -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)
|
||||
|
||||
|
||||
+13
-13
@@ -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)
|
||||
|
||||
|
||||
@@ -0,0 +1,117 @@
|
||||
//! Web / Endpoint Artifact classification from bound Metadata.
|
||||
//!
|
||||
//! Spec: `doc/design/ext-web-artifact.md` · ADR 0007.
|
||||
//! Does not add CORE_CONSTRUCTS — reuses flat frontmatter `type` / `类型`.
|
||||
|
||||
use crate::value::Value;
|
||||
|
||||
/// Kind of executable document recognized for the Web model.
|
||||
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
|
||||
pub enum ArtifactKind {
|
||||
/// `type: web` / `类型: 网页`
|
||||
Web,
|
||||
/// `type: endpoint` / `类型: 端点`
|
||||
Endpoint,
|
||||
/// `type: prompt` / `类型: 提示` (AI stack; classified for inspect)
|
||||
Prompt,
|
||||
/// `type: llm` / other known types
|
||||
Other,
|
||||
}
|
||||
|
||||
/// Read `type` or `类型` from bound metadata.
|
||||
pub fn metadata_type(metadata: &[(String, Value)]) -> Option<String> {
|
||||
for key in ["type", "类型"] {
|
||||
if let Some(v) = meta_get(metadata, key) {
|
||||
let s = v.as_display();
|
||||
if !s.is_empty() {
|
||||
return Some(s);
|
||||
}
|
||||
}
|
||||
}
|
||||
None
|
||||
}
|
||||
|
||||
/// Classify artifact kind from metadata (None if no type key).
|
||||
pub fn classify(metadata: &[(String, Value)]) -> Option<ArtifactKind> {
|
||||
let t = metadata_type(metadata)?;
|
||||
Some(match t.as_str() {
|
||||
"web" | "网页" => ArtifactKind::Web,
|
||||
"endpoint" | "端点" => ArtifactKind::Endpoint,
|
||||
"prompt" | "提示" => ArtifactKind::Prompt,
|
||||
_ => ArtifactKind::Other,
|
||||
})
|
||||
}
|
||||
|
||||
/// True when this module is a Web Document Artifact.
|
||||
pub fn is_web_document(metadata: &[(String, Value)]) -> bool {
|
||||
matches!(classify(metadata), Some(ArtifactKind::Web))
|
||||
}
|
||||
|
||||
/// True when this module is an Endpoint Artifact.
|
||||
pub fn is_endpoint(metadata: &[(String, Value)]) -> bool {
|
||||
matches!(classify(metadata), Some(ArtifactKind::Endpoint))
|
||||
}
|
||||
|
||||
/// Lookup a metadata string (EN key, then ZH aliases).
|
||||
pub fn meta_text(metadata: &[(String, Value)], en: &str, zh: &str) -> Option<String> {
|
||||
for key in [en, zh] {
|
||||
if let Some(v) = meta_get(metadata, key) {
|
||||
let s = v.as_display();
|
||||
if !s.is_empty() {
|
||||
return Some(s);
|
||||
}
|
||||
}
|
||||
}
|
||||
None
|
||||
}
|
||||
|
||||
/// Route for a web document: `route` / `路由`, else None.
|
||||
pub fn web_route(metadata: &[(String, Value)]) -> Option<String> {
|
||||
meta_text(metadata, "route", "路由")
|
||||
}
|
||||
|
||||
/// HTTP method defaulting to GET.
|
||||
pub fn http_method(metadata: &[(String, Value)]) -> String {
|
||||
meta_text(metadata, "method", "方法").unwrap_or_else(|| "GET".to_string())
|
||||
}
|
||||
|
||||
/// Endpoint path: `path` / `路径`.
|
||||
pub fn endpoint_path(metadata: &[(String, Value)]) -> Option<String> {
|
||||
meta_text(metadata, "path", "路径")
|
||||
}
|
||||
|
||||
fn meta_get<'a>(metadata: &'a [(String, Value)], key: &str) -> Option<&'a Value> {
|
||||
metadata.iter().find(|(k, _)| k == key).map(|(_, v)| v)
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
use crate::value::Value;
|
||||
|
||||
#[test]
|
||||
fn classify_web_en_zh() {
|
||||
let en = vec![("type".into(), Value::Text("web".into()))];
|
||||
assert_eq!(classify(&en), Some(ArtifactKind::Web));
|
||||
let zh = vec![("类型".into(), Value::Text("网页".into()))];
|
||||
assert_eq!(classify(&zh), Some(ArtifactKind::Web));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn classify_endpoint() {
|
||||
let m = vec![
|
||||
("type".into(), Value::Text("endpoint".into())),
|
||||
("path".into(), Value::Text("/api/x".into())),
|
||||
("method".into(), Value::Text("POST".into())),
|
||||
];
|
||||
assert!(is_endpoint(&m));
|
||||
assert_eq!(endpoint_path(&m).as_deref(), Some("/api/x"));
|
||||
assert_eq!(http_method(&m), "POST");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn no_type() {
|
||||
let m = vec![("title".into(), Value::Text("x".into()))];
|
||||
assert_eq!(classify(&m), None);
|
||||
}
|
||||
}
|
||||
@@ -201,6 +201,7 @@ pub enum HostFn {
|
||||
Meta = 192,
|
||||
MetaGet = 193,
|
||||
ModuleSource = 194,
|
||||
ArtifactKind = 195,
|
||||
}
|
||||
|
||||
|
||||
@@ -392,6 +393,7 @@ impl HostFn {
|
||||
192 => Self::Meta,
|
||||
193 => Self::MetaGet,
|
||||
194 => Self::ModuleSource,
|
||||
195 => Self::ArtifactKind,
|
||||
_ => return None,
|
||||
})
|
||||
}
|
||||
@@ -586,6 +588,7 @@ impl HostFn {
|
||||
"host_meta" | "meta" => Self::Meta,
|
||||
"host_meta_get" | "meta_get" => Self::MetaGet,
|
||||
"host_module_source" | "module_source" => Self::ModuleSource,
|
||||
"host_artifact_kind" | "artifact_kind" => Self::ArtifactKind,
|
||||
_ => return None,
|
||||
})
|
||||
}
|
||||
@@ -767,6 +770,7 @@ impl HostFn {
|
||||
Self::Meta => "host_meta",
|
||||
Self::MetaGet => "host_meta_get",
|
||||
Self::ModuleSource => "host_module_source",
|
||||
Self::ArtifactKind => "host_artifact_kind",
|
||||
Self::WritebackRecord => "host_writeback_record",
|
||||
Self::WritebackGet => "host_writeback_get",
|
||||
Self::WritebackClear => "host_writeback_clear",
|
||||
@@ -790,7 +794,7 @@ impl HostFn {
|
||||
&["path"]
|
||||
}
|
||||
Self::WriteText | Self::AppendText => &["path", "text"],
|
||||
Self::NowUnix | Self::NowMs | Self::Args | Self::Cwd | Self::Meta | Self::ModuleSource => {
|
||||
Self::NowUnix | Self::NowMs | Self::Args | Self::Cwd | Self::Meta | Self::ModuleSource | Self::ArtifactKind => {
|
||||
&[]
|
||||
}
|
||||
Self::FormatTime => &["unix", "pattern"],
|
||||
@@ -998,6 +1002,7 @@ pub fn call_host(
|
||||
HostFn::Meta => sys::meta(ctx),
|
||||
HostFn::MetaGet => sys::meta_get(ctx, require(bound, "key")?),
|
||||
HostFn::ModuleSource => crate::host::agent_rt::module_source(ctx),
|
||||
HostFn::ArtifactKind => sys::artifact_kind(ctx),
|
||||
HostFn::Exit => sys::exit(ctx, require(bound, "code")?),
|
||||
HostFn::Exec => sys::exec(
|
||||
ctx,
|
||||
|
||||
@@ -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}`")),
|
||||
};
|
||||
|
||||
|
||||
@@ -109,6 +109,17 @@ pub fn meta_get(ctx: &HostContext, key: &Value) -> Result<Value, String> {
|
||||
.unwrap_or(Value::None))
|
||||
}
|
||||
|
||||
/// Classify entry Artifact (`web` / `endpoint` / `prompt` / `other`); missing type → None.
|
||||
pub fn artifact_kind(ctx: &HostContext) -> Result<Value, String> {
|
||||
Ok(match crate::artifact::classify(&ctx.entry_metadata) {
|
||||
None => Value::None,
|
||||
Some(crate::artifact::ArtifactKind::Web) => Value::Text("web".into()),
|
||||
Some(crate::artifact::ArtifactKind::Endpoint) => Value::Text("endpoint".into()),
|
||||
Some(crate::artifact::ArtifactKind::Prompt) => Value::Text("prompt".into()),
|
||||
Some(crate::artifact::ArtifactKind::Other) => Value::Text("other".into()),
|
||||
})
|
||||
}
|
||||
|
||||
pub fn exit(ctx: &HostContext, code: &Value) -> Result<Value, String> {
|
||||
let c = as_i64(code, "code")?;
|
||||
if ctx.soft_side_effects {
|
||||
|
||||
@@ -205,12 +205,53 @@ impl Interpreter {
|
||||
true,
|
||||
);
|
||||
}
|
||||
// Web Artifact entry (ADR 0007): `type: web|endpoint` may be pure document —
|
||||
// no `# main`. Return a Result-shaped summary for run/check gold paths.
|
||||
if let Some(kind) = crate::artifact::classify(&module.metadata) {
|
||||
use crate::artifact::ArtifactKind;
|
||||
if matches!(kind, ArtifactKind::Web | ArtifactKind::Endpoint) {
|
||||
return Ok(Self::artifact_run_summary(module, kind));
|
||||
}
|
||||
}
|
||||
bail!("no `# main` object to run");
|
||||
})();
|
||||
self.site_module = prev;
|
||||
result
|
||||
}
|
||||
|
||||
|
||||
fn artifact_run_summary(module: &Module, kind: crate::artifact::ArtifactKind) -> Value {
|
||||
use crate::artifact::{endpoint_path, http_method, web_route, ArtifactKind};
|
||||
let kind_s = match kind {
|
||||
ArtifactKind::Web => "web",
|
||||
ArtifactKind::Endpoint => "endpoint",
|
||||
ArtifactKind::Prompt => "prompt",
|
||||
ArtifactKind::Other => "other",
|
||||
};
|
||||
let mut value = vec![
|
||||
("kind".into(), Value::Text(kind_s.into())),
|
||||
("method".into(), Value::Text(http_method(&module.metadata))),
|
||||
];
|
||||
match kind {
|
||||
ArtifactKind::Web => {
|
||||
if let Some(r) = web_route(&module.metadata) {
|
||||
value.push(("route".into(), Value::Text(r)));
|
||||
}
|
||||
}
|
||||
ArtifactKind::Endpoint => {
|
||||
if let Some(r) = endpoint_path(&module.metadata) {
|
||||
value.push(("path".into(), Value::Text(r)));
|
||||
}
|
||||
}
|
||||
_ => {}
|
||||
}
|
||||
Value::Map(vec![
|
||||
("ok".into(), Value::Bool(true)),
|
||||
("value".into(), Value::Map(value)),
|
||||
("error".into(), Value::None),
|
||||
])
|
||||
}
|
||||
|
||||
/// Resolve `lib.member` on the site (entry) module — used by ABI `call_lib_path`.
|
||||
pub(crate) fn call_site_lib_path(
|
||||
&mut self,
|
||||
|
||||
@@ -4,6 +4,7 @@
|
||||
//! CLI also offers `view` for AST-backed browsing.
|
||||
|
||||
pub mod aliases;
|
||||
pub mod artifact;
|
||||
pub mod ast;
|
||||
pub mod binding;
|
||||
pub mod browser_session;
|
||||
|
||||
@@ -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
|
||||
@@ -0,0 +1,11 @@
|
||||
---
|
||||
type: web
|
||||
title: artifact document gold
|
||||
route: /
|
||||
method: GET
|
||||
description: Core recognizes type:web without # main (ADR 0007).
|
||||
---
|
||||
|
||||
# Artifact Document
|
||||
|
||||
This file is a Web Document. Running it returns a Result summary.
|
||||
@@ -0,0 +1,10 @@
|
||||
---
|
||||
type: endpoint
|
||||
method: POST
|
||||
path: /api/ping
|
||||
request: json
|
||||
response: json
|
||||
description: Core recognizes type:endpoint without # main (ADR 0007).
|
||||
---
|
||||
|
||||
Endpoint body is documentation + handler when served.
|
||||
@@ -0,0 +1,39 @@
|
||||
---
|
||||
title: web artifact render smoke
|
||||
description: Unified View nodes + document render (ADR 0007); offline, no listen.
|
||||
import web:ext/web/web.mq.md
|
||||
import text:lib/text.mq.md
|
||||
---
|
||||
|
||||
# main
|
||||
|
||||
`nodes` =
|
||||
|
||||
| type | slot | value | attrs | style |
|
||||
|------|------|-------|-------|-------|
|
||||
| text | kicker | AI Native | | eyebrow |
|
||||
| title | title | Marqdo | | title |
|
||||
| link | action | Read More | /docs | button |
|
||||
|
||||
**html = > web.render nodes=`nodes` title="smoke"**
|
||||
1. `html`
|
||||
**ok = > text.contains text=`html` sub="Marqdo"**
|
||||
1. `ok`
|
||||
> print text=render-nodes-ok
|
||||
2. *
|
||||
> print text=render-nodes-fail
|
||||
2. *
|
||||
> print text=render-nodes-fail
|
||||
|
||||
**doc = > web.render body="# Hello\n\nWorld" title="Doc"**
|
||||
**ok2 = > text.contains text=`doc` sub="Hello"**
|
||||
1. `ok2`
|
||||
> print text=render-doc-ok
|
||||
2. *
|
||||
> print text=render-doc-fail
|
||||
|
||||
**insp = > web.inspect**
|
||||
1. `insp`
|
||||
> print text=inspect-ok
|
||||
2. *
|
||||
> print text=inspect-fail
|
||||
@@ -0,0 +1,18 @@
|
||||
---
|
||||
type: endpoint
|
||||
method: GET
|
||||
path: /api/ping
|
||||
request: none
|
||||
response: json
|
||||
auth: none
|
||||
---
|
||||
|
||||
# main
|
||||
|
||||
`out` =
|
||||
|
||||
| ok | ping |
|
||||
|----|------|
|
||||
| True | pong |
|
||||
|
||||
*out*
|
||||
@@ -0,0 +1,10 @@
|
||||
---
|
||||
type: web
|
||||
title: Artifact site
|
||||
route: /
|
||||
method: GET
|
||||
---
|
||||
|
||||
# Artifact site
|
||||
|
||||
Home Document for live Endpoint tests.
|
||||
@@ -0,0 +1,10 @@
|
||||
---
|
||||
type: web
|
||||
title: About
|
||||
route: /about
|
||||
method: GET
|
||||
---
|
||||
|
||||
# About
|
||||
|
||||
Declared Document route.
|
||||
@@ -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
|
||||
@@ -0,0 +1,10 @@
|
||||
---
|
||||
类型: 网页
|
||||
路由: /zh
|
||||
方法: GET
|
||||
标题: 中文文档金样
|
||||
---
|
||||
|
||||
# 中文网页 Artifact
|
||||
|
||||
核心识别 `类型: 网页`。
|
||||
@@ -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="<p>assets live</p>"**
|
||||
**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
|
||||
@@ -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
|
||||
@@ -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" 引言="<p>home</p>"**
|
||||
**login = > 网页.页面 标题="登录" 引言="<div class='panel'><h1>登录</h1><div id='auth-mount'></div></div>"**
|
||||
**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*
|
||||
@@ -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
|
||||
@@ -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
|
||||
@@ -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="<aside"**
|
||||
**nd = > 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
|
||||
@@ -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
|
||||
@@ -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
|
||||
@@ -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
|
||||
@@ -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
|
||||
@@ -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
|
||||
@@ -0,0 +1,30 @@
|
||||
---
|
||||
title: ext/data db smoke
|
||||
description: DB Resource lives in ext/data (ADR 0007).
|
||||
import data:ext/data/db.mq.md
|
||||
import fs:lib/fs.mq.md
|
||||
---
|
||||
|
||||
# main
|
||||
|
||||
**store = > data.db url="sqlite:web-fixtures/data/artifact-db.db"**
|
||||
`fields` =
|
||||
|
||||
| 字段 | 类型 | 可空 |
|
||||
|------|------|------|
|
||||
| title | text | False |
|
||||
| body | text | True |
|
||||
|
||||
> `store`.init name=notes fields=`fields`
|
||||
`row` =
|
||||
|
||||
| title | body |
|
||||
|-------|------|
|
||||
| hello | world |
|
||||
|
||||
> `store`.insert table=notes rows=`row`
|
||||
**got = > `store`.select table="notes" limit=1**
|
||||
1. `got`
|
||||
> print text=db-ok
|
||||
2. *
|
||||
> print text=db-fail
|
||||
@@ -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*
|
||||
@@ -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
|
||||
@@ -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
|
||||
@@ -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
|
||||
@@ -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
|
||||
|
||||
<!-- cache: memory backend -->
|
||||
|
||||
**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
|
||||
|
||||
<!-- storage: file backend -->
|
||||
|
||||
**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"
|
||||
|
||||
<!-- db: postgres URL is accepted as a handle (no live server required) -->
|
||||
|
||||
**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 URL shape validates at open -->
|
||||
|
||||
**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
|
||||
@@ -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
|
||||
|
||||
<!--
|
||||
Run from a different cwd than the script dir (e.g. repo root):
|
||||
the sqlite file must land under <script dir>/entrydir-fixtures/data,
|
||||
NOT under the process cwd.
|
||||
-->
|
||||
|
||||
**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
|
||||
@@ -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="<h1>Compose</h1>"**
|
||||
**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
|
||||
@@ -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 = "<div class=\"cols\"><section id=\"left\">voice</section><div id=\"qd-note-form-mount\"></div></div>"**
|
||||
**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\"><div class=\"site-form\""**
|
||||
1. `has_mount`
|
||||
1. `has_form`
|
||||
1. `order_ok`
|
||||
> print text=slot-ok
|
||||
2. *
|
||||
> print text=slot-order-fail
|
||||
2. *
|
||||
> print text=slot-form-fail
|
||||
2. *
|
||||
> print text=slot-mount-fail
|
||||
@@ -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
|
||||
@@ -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="<section class='post-comments'><h2>Comments</h2><div id='comment-list'></div><div id='comment-form-mount'></div></section>"**
|
||||
**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
|
||||
@@ -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
|
||||
Loaded 100 of 132 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user