Compare commits
104
Commits
v0.3.8
..
ext-v1.0.6
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
8e23a5395a | ||
|
|
cab609ee91 | ||
|
|
b752cd49b7 | ||
|
|
2c91b5cc7b | ||
|
|
453321c8c2 | ||
|
|
981d754133 | ||
|
|
410f36f719 | ||
|
|
bd06aedb90 | ||
|
|
42ddeb14e7 | ||
|
|
6bd127a313 | ||
|
|
4b7643d833 | ||
|
|
3f96592c99 | ||
|
|
98018fc63b | ||
|
|
aeac4d6d20 | ||
|
|
9e9a80df31 | ||
|
|
5f07b1c3b1 | ||
|
|
bfea2204eb | ||
|
|
fb30cd3db3 | ||
|
|
584cb9ac9d | ||
|
|
428ee141e1 | ||
|
|
ec9718466d | ||
|
|
c5bb08022a | ||
|
|
b710745e88 | ||
|
|
5cf84fe9b7 | ||
|
|
27991a7822 | ||
|
|
d1e2f0ced0 | ||
|
|
e848306187 | ||
|
|
2ee9d7e66d | ||
|
|
e31585842d | ||
|
|
f068b4ab75 | ||
|
|
26e29409a9 | ||
|
|
4923129d10 | ||
|
|
8ab55e2193 | ||
|
|
9bc7ef3b5a | ||
|
|
9431ad835c | ||
|
|
2984d7d4f8 | ||
|
|
6324036e41 | ||
|
|
3287799959 | ||
|
|
f95e5d3339 | ||
|
|
52b4bae423 | ||
|
|
037592087c | ||
|
|
3eb8e732ea | ||
|
|
761b92afce | ||
|
|
b5f43ee993 | ||
|
|
76da97f090 | ||
|
|
7554e45f60 | ||
|
|
6994acb91d | ||
|
|
bccfec86ba | ||
|
|
114fd53cd1 | ||
|
|
c8f41164c5 | ||
|
|
6f303ff957 | ||
|
|
95a49697f7 | ||
|
|
8846f5f070 | ||
|
|
4f09e515ee | ||
|
|
551f4ff322 | ||
|
|
d5a9301c7f | ||
|
|
34915e3b16 | ||
|
|
c55aad775e | ||
|
|
ac3f0633cd | ||
|
|
d55567a634 | ||
|
|
abcb141737 | ||
|
|
8d97adc1dc | ||
|
|
5c37d54070 | ||
|
|
fecaacd5be | ||
|
|
53bc3538da | ||
|
|
0e0655b316 | ||
|
|
5058f5ddcf | ||
|
|
4a1c9c48a2 | ||
|
|
5e74ff39f2 | ||
|
|
b5c07385e9 | ||
|
|
bfb10d172b | ||
|
|
00a77181ef | ||
|
|
e13468dc43 | ||
|
|
d3b137c919 | ||
|
|
e292c8a7c7 | ||
|
|
ce195998c1 | ||
|
|
e20cf8b386 | ||
|
|
c4a726397d | ||
|
|
7fab85b389 | ||
|
|
12d2c7be69 | ||
|
|
26955f4f36 | ||
|
|
56df0736fa | ||
|
|
695939ac74 | ||
|
|
4c06851e0e | ||
|
|
23e4bc406e | ||
|
|
fe18c4d1d6 | ||
|
|
e6fdeb0b31 | ||
|
|
5ec4b3c17d | ||
|
|
6e94d0a179 | ||
|
|
4357045904 | ||
|
|
1ef71d7492 | ||
|
|
1fc985db7e | ||
|
|
364428ca1e | ||
|
|
09b549a862 | ||
|
|
2d238a8c36 | ||
|
|
7a0309284a | ||
|
|
fd3f1724e6 | ||
|
|
ca40c698a2 | ||
|
|
fb6254e501 | ||
|
|
cf9d96477b | ||
|
|
493d0ad91a | ||
|
|
a0e88919a6 | ||
|
|
237962c3be | ||
|
|
1637acce6e |
No files matched your search
@@ -63,22 +63,22 @@ Cells are expressions (`doc/design/table-cell-expressions.md`): bare words = tex
|
||||
**Single dynamic key** — one `table.put` (or a helper), not a json chain:
|
||||
|
||||
```markdown
|
||||
*`set_text` = > table.put in=None at="#log" value=msg*
|
||||
**> table.put in=None at="set_text" value=set_text**
|
||||
**`set_text` = table.put in=None at="#log" value=msg**
|
||||
**table.put in=None at="set_text" value=set_text**
|
||||
```
|
||||
|
||||
Better still — call a named helper:
|
||||
|
||||
```markdown
|
||||
**> browser.set_text sel="#log" text=msg**
|
||||
**browser.set_text sel="#log" text=msg**
|
||||
```
|
||||
|
||||
### 3. Bad pattern (do not write)
|
||||
|
||||
```markdown
|
||||
*`ret` = > json.set map=None key="set_text" value=…*
|
||||
*`ret` = > json.set map=ret key="canvas" value=…*
|
||||
*`cmds` = > json.append list=cmds item=c0*
|
||||
**`ret` = json.set map=None key="set_text" value=…**
|
||||
**`ret` = json.set map=ret key="canvas" value=…**
|
||||
**`cmds` = json.append list=cmds item=c0**
|
||||
```
|
||||
|
||||
## Writing application `.mq.md`
|
||||
@@ -88,23 +88,31 @@ Better still — call a named helper:
|
||||
3. `##` handlers: short prose OK; data as tables; return via `browser.*` / `web.*` / one `table.put`.
|
||||
4. Blank line between comment paragraphs and code.
|
||||
5. Run `marqdo run path.mq.md` from repo root.
|
||||
6. **Calls in narrative:** prefer `**结果 = 某函数 名=`x`**` (no `>` on the RHS). Bracket form `礼貌 [问候] "x"` / `**出 = [put] …**` is fine when modifiers help. Use `> …` for standalone step lists. See `examples/code-as-docs/`.
|
||||
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.
|
||||
|
||||
## Developing libraries (`lib/*`, `ext/*`)
|
||||
|
||||
Canonical thin-template + waves: [lib-code-as-docs.md](../../doc/design/lib-code-as-docs.md) · [roadmap/lib-ext-code-as-docs.md](../../doc/roadmap/lib-ext-code-as-docs.md).
|
||||
|
||||
### Goals
|
||||
|
||||
- **Authors** see tables and short calls; **library** may hide `table.put` / host calls.
|
||||
- One concern per helper; name the effect (`set_text`, `canvas`, …), do not expose bag surgery.
|
||||
- EN + ZH pair when shipping user-facing libs (`lib/browser.mq.md` ↔ `lib/浏览器.mq.md`, `ext/web` ↔ `ext/web/网页.mq.md`).
|
||||
- `ext/**` never calls `host_*` — use plugins / public lib only (`doc/design/ext-agent.md`).
|
||||
- Collection get: **`[key](coll)`** (no new footnote indexes). Calls in examples may use `修饰 [fn] …` or classic `>` / bold.
|
||||
|
||||
### Library checklist
|
||||
|
||||
- [ ] Purpose sentence + prose params + one example + short body
|
||||
- [ ] Public examples use **tables + helpers**, not json glue
|
||||
- [ ] Index with `[k](c)`; foreach `- [item](coll)`
|
||||
- [ ] Helpers documented with a one-line purpose above `##`
|
||||
- [ ] Defaults on `+` params; omit `None` fields in merged maps
|
||||
- [ ] Defaults on params; omit `None` fields in merged maps
|
||||
- [ ] No `json.set` chains in new code — use `table.put` / `table.merge` / GFM
|
||||
- [ ] `marqdo run` on a tiny demo under `examples/` or inline smoke
|
||||
|
||||
|
||||
@@ -1,13 +1,14 @@
|
||||
---
|
||||
name: marqdo-release
|
||||
description: >-
|
||||
Run a full Marqdo product release: detect latest version and ask the user for
|
||||
the next tag, update CHANGELOG/README/skills/public docs, bump Cargo versions,
|
||||
sync VS Code extension on branch vscode-extension when needed, build or
|
||||
trigger install assets (CLI, stdlib, ext, public zip, VSIX, wasm notes), push
|
||||
tag, publish GitHub Release with detailed notes, and recover from network
|
||||
failures via proxy. Use when the user asks to release, cut a version, publish
|
||||
vX.Y.Z, ship a GitHub release, 发版, 发布新版本, or tag marqdo.
|
||||
Run a Marqdo product release: detect latest version and ask the user for the
|
||||
next tag (or confirm mode), update CHANGELOG/README/skills/public docs, bump
|
||||
Cargo and/or ext/VERSION, sync VS Code extension when needed, publish GitHub
|
||||
Release assets, upload extension packs to Cloudflare R2 (ext.marqdo.com) and
|
||||
GitHub, ship Ubuntu CLI via PPA (scripts/ppa-ship.sh), and print manual
|
||||
commands when sudo/GPG/network steps need the user. Use when the user asks to
|
||||
release, cut a version, publish vX.Y.Z, ext-only pack, PPA, 发版, 发布新版本,
|
||||
or tag marqdo.
|
||||
---
|
||||
|
||||
# Marqdo release
|
||||
@@ -16,151 +17,193 @@ Canonical release playbook for **cflmy/marqdo**. Read this skill **before** tagg
|
||||
|
||||
## Hard rules
|
||||
|
||||
1. **Never invent the next version.** Detect current versions → **stop and ask the user** for the next SemVer (`X.Y.Z`). Do not proceed until they confirm.
|
||||
1. **Never invent the next version.** Detect current versions → **stop and ask the user** for the next SemVer (`X.Y.Z`) and **release mode** if unclear. Do not proceed until they confirm (unless they already stated both in the same message).
|
||||
2. **Never force-push** `main` / tags. **Never** `--no-verify` unless the user explicitly orders it.
|
||||
3. **Never commit `vscode-extension/` on `main`** (gitignored). Extension source lives only on branch **`vscode-extension`**. See `doc/design/vscode-extension-commit.md`.
|
||||
4. **Do not release from a dirty tree** (except intentional release commits you create in this flow).
|
||||
5. **Tag format** is always `vX.Y.Z` matching root `Cargo.toml` `version = "X.Y.Z"`.
|
||||
6. Prefer **tag push → GitHub Actions** (`.github/workflows/release.yml`) for Windows CLI + VSIX + zips. Local packaging is fallback / verification.
|
||||
7. After network errors: apply [reference.md § Proxy](reference.md); retry; do not silently skip uploads.
|
||||
5. **Tag format:** CLI/full → `vX.Y.Z` matching root `Cargo.toml`. Ext-only → `ext-vX.Y.Z` matching `ext/VERSION` (Cargo may stay unchanged).
|
||||
6. Prefer **tag push → GitHub Actions** (`.github/workflows/release.yml`) for Windows/Linux install assets. Local packaging is fallback / verification.
|
||||
7. After network errors: apply [reference.md § Proxy](reference.md). **First try** `https://proxy.cflmy.top/github.com/cflmy/marqdo.git`. Retry; do not silently skip uploads. If needed: **HK jump** (`scripts/push-via-hk-jump.py`).
|
||||
8. **Do not ship a full GitHub Release without the Linux extension/native zip** when the mode includes ext packs. Missing Linux packages = incomplete for that mode.
|
||||
9. **Extension packs always publish to both** Cloudflare R2 (`https://ext.marqdo.com` via `scripts/upload-ext-r2.py`) **and** GitHub (Release assets / `ext-v*` tag). Credentials only in `~/.marqdo/r2.env` / CI — **never** commit. See [ext-cdn.md](../../../doc/design/ext-cdn.md).
|
||||
10. **CLI Ubuntu package = PPA** (`ppa:cflmy/marqdo`) via `./scripts/ppa-ship.sh` / `ppa-build-source.sh`. GitHub zips remain for Windows and non-apt Linux.
|
||||
11. **When a step needs the user** (sudo password, GPG passphrase, Launchpad UI, interactive `dput`): **stop, state what failed, and give the exact commands** to run in their terminal. Do not pretend the step succeeded.
|
||||
|
||||
## Defaults (after version is confirmed)
|
||||
## Release modes
|
||||
|
||||
Unless the user overrides, apply these automatically — **do not re-ask**:
|
||||
Ask (or take from user message) which mode:
|
||||
|
||||
| Mode | Bumps | Git tag | GitHub assets | R2 CDN | Ubuntu PPA |
|
||||
|------|-------|---------|---------------|--------|------------|
|
||||
| **full** (default) | `Cargo.toml` + `ext/VERSION` (same SemVer) | `vX.Y.Z` | CLI + ext + native + VSIX + … | yes | yes |
|
||||
| **cli** | `Cargo.toml` only | `vX.Y.Z` | CLI (+ optional attach prior ext) | no (unless user asks) | yes |
|
||||
| **ext** | `ext/VERSION` only | `ext-vX.Y.Z` (or attach to latest CLI release) | ext.zip + native-*.zip | **required** | no |
|
||||
|
||||
Defaults after version+mode confirmed — **do not re-ask**:
|
||||
|
||||
| Setting | Default |
|
||||
|---------|---------|
|
||||
| Sync / bump `vscode-extension` to same `VER` | **yes** |
|
||||
| Push `main`, create annotated tag, push tag immediately (trigger CI) | **yes** |
|
||||
| Release notes language | **中英双语** (Chinese first, then English section, or paired ZH/EN under each heading) |
|
||||
| Skip VSIX | **no** |
|
||||
| Docs-only release | **no** (full asset pipeline via CI) |
|
||||
| Sync / bump `vscode-extension` to same `VER` | **yes** for full/cli; **no** for ext-only |
|
||||
| Push `main`, create annotated tag, push tag (trigger CI) | **yes** for full/cli |
|
||||
| Ext packs → R2 **and** GitHub | **yes** whenever ext ships |
|
||||
| Ubuntu PPA upload after CLI tag | **yes** for full/cli |
|
||||
| Release notes language | **中英双语** |
|
||||
| Deploy gh-pages after release | **no** (only if user asks) |
|
||||
|
||||
Phase 0 asks **only** for the next version (and optional overrides). Example ask:
|
||||
Phase 0 ask example:
|
||||
|
||||
> 当前最新是 **vA.B.C**。请指定下一个版本号(如 `0.3.2`)。其余按默认:同步扩展、立刻打 tag 发布、中英双语说明。
|
||||
> 当前最新 CLI **vA.B.C**,扩展包 **E.F.G**。请指定下一个版本号与模式(`full` / `cli` / `ext`,如 `1.0.3 full`)。
|
||||
|
||||
## Phase 0 — Detect versions (mandatory stop)
|
||||
|
||||
Run in repo root (parallel OK):
|
||||
|
||||
```bash
|
||||
python3 .cursor/skills/marqdo-release/scripts/detect_version.py
|
||||
# or: rg / git tag / gh release list — see reference.md
|
||||
```
|
||||
|
||||
Report briefly, then **ask only for the next SemVer** (defaults above). Wait for confirmation. Normalize to `VER=X.Y.Z` and `TAG=vX.Y.Z`.
|
||||
Report briefly, then **ask for SemVer + mode** (unless already given). Normalize `VER` / `TAG`.
|
||||
|
||||
## Phase 1 — Preflight
|
||||
|
||||
Copy and track:
|
||||
|
||||
```
|
||||
Release progress:
|
||||
- [ ] Phase 0: version confirmed by user (TAG=…)
|
||||
- [ ] Phase 0: version + mode confirmed
|
||||
- [ ] Phase 1: preflight green
|
||||
- [ ] Phase 2: docs + version bumps committed
|
||||
- [ ] Phase 3: extension branch (if needed)
|
||||
- [ ] Phase 3: extension branch (full/cli)
|
||||
- [ ] Phase 4: main pushed; tag created & pushed
|
||||
- [ ] Phase 5: CI / assets / release notes verified
|
||||
- [ ] Phase 6: post-release checks
|
||||
- [ ] Phase 5: CI / GitHub assets / notes
|
||||
- [ ] Phase 6: R2 upload (if ext ships)
|
||||
- [ ] Phase 7: Ubuntu PPA (full/cli)
|
||||
- [ ] Phase 8: post-release checks
|
||||
```
|
||||
|
||||
Checks:
|
||||
|
||||
1. `git status` clean or only release WIP you control.
|
||||
2. `git checkout main && git pull --ff-only origin main`.
|
||||
3. Quick gate: `cargo test --test gold structure_hello` (and any release-critical tests the user named). Full gold suite if time allows.
|
||||
4. `CHANGELOG.md` has meaningful **Unreleased** notes; if empty, draft from `git log vLAST..HEAD --oneline` and confirm with user.
|
||||
5. Confirm no secrets in the commit (`*.env`, credentials).
|
||||
Checks: clean tree; `main` ff-only; smoke tests; CHANGELOG Unreleased; no secrets.
|
||||
|
||||
## Phase 2 — Docs & version bumps (main)
|
||||
|
||||
Bump **in lockstep**:
|
||||
|
||||
| File | Change |
|
||||
|------|--------|
|
||||
| `Cargo.toml` | `version = "VER"` |
|
||||
| `crates/marqdo-wasm/Cargo.toml` | same `VER` |
|
||||
| `CHANGELOG.md` | Move `## Unreleased` → `## vVER — YYYY-MM-DD`; leave fresh empty `## Unreleased` |
|
||||
| `README.md` | 「现状 / 如何使用最新」version strings, checkout tag, release URL |
|
||||
| `.cursor/skills/marqdo/SKILL.md` | Version-sensitive bullets if any (WASM/web status); keep rules accurate |
|
||||
| `public/**` | User-facing tutorials if features shipped (welcome, features/*, extensions). Prefer small factual updates over rewrites |
|
||||
| `doc/roadmap/*.md` | Mark shipped waves done if this release closes them |
|
||||
| `.github/workflows/release.yml` | Update **Highlights** body template to this release (CI still uses hardcoded blurb—keep in sync) |
|
||||
|
||||
Public HTML: regenerate before packaging / pages deploy:
|
||||
| File | full | cli | ext |
|
||||
|------|------|-----|-----|
|
||||
| `Cargo.toml` + `crates/marqdo-wasm/Cargo.toml` | bump | bump | — |
|
||||
| `ext/VERSION` | bump | — | bump |
|
||||
| `CHANGELOG.md` | `## vVER` | `## vVER` | `## Ext pack vVER` |
|
||||
| `README.md` / `public/**` install + download table | update | update | update ext notes |
|
||||
| `.cursor/skills/marqdo/SKILL.md` | if surface changed | same | rare |
|
||||
| `.github/workflows/release.yml` Highlights stub | yes | yes | — |
|
||||
|
||||
```bash
|
||||
./scripts/build-public.sh
|
||||
# outputs under public/ (gitignored HTML); used by release zip / gh-pages
|
||||
./scripts/build-public.sh # when public/ sources changed
|
||||
```
|
||||
|
||||
Commit on `main` (HEREDOC message), e.g.:
|
||||
|
||||
```text
|
||||
release: vVER — <one-line highlight>
|
||||
|
||||
EOF
|
||||
```
|
||||
|
||||
Push `main`: `git push origin main` (with proxy/`all` perms if needed).
|
||||
|
||||
## Phase 3 — VS Code / Cursor extension
|
||||
|
||||
**Default: always** bump extension to `VER` on branch `vscode-extension` (skip only if user said so).
|
||||
|
||||
1. `git fetch origin vscode-extension`
|
||||
2. Work on `vscode-extension` branch (not main):
|
||||
- Bump `vscode-extension/package.json` `version` to `VER`.
|
||||
- Update `engines` / CLI version hints in extension README if present.
|
||||
- `npm ci && npm run compile`
|
||||
3. Commit & `git push origin vscode-extension`.
|
||||
4. Return to `main`. **Do not** add `vscode-extension/` to main.
|
||||
|
||||
## Phase 4 — Tag & trigger CI
|
||||
Commit + push `main` (proxy origin). On push failure → reference § Proxy; if still blocked, **print** for the user:
|
||||
|
||||
```bash
|
||||
git tag -a "TAG" -m "TAG"
|
||||
git push origin "TAG"
|
||||
git push https://proxy.cflmy.top/github.com/cflmy/marqdo.git HEAD:main
|
||||
# or: python3 scripts/push-via-hk-jump.py
|
||||
```
|
||||
|
||||
This runs `.github/workflows/release.yml` (Windows): CLI exe/zip, stdlib zip, ext zip, source zip, public zip, VSIX.
|
||||
## Phase 3 — VS Code / Cursor extension (full/cli only)
|
||||
|
||||
If tag push fails: [reference.md § Proxy](reference.md), retry once; then report.
|
||||
Default: bump `vscode-extension` package.json to `VER`, compile, push branch `vscode-extension`, return to `main`.
|
||||
|
||||
## Phase 5 — Release notes & assets
|
||||
## Phase 4 — Tag & trigger CI (full/cli)
|
||||
|
||||
1. Wait for Actions success: `gh run list --workflow=Release --limit 3` / open the run URL.
|
||||
2. Ensure GitHub Release for `TAG` exists with assets (workflow uses `softprops/action-gh-release`).
|
||||
3. **Rewrite release body** (workflow body is a stub) with **中英双语** — see [reference.md § Notes template](reference.md). `gh release edit TAG --notes-file …`.
|
||||
4. Include: Highlights, Breaking, Install (`ext add`, plugins build), Downloads table, WASM (`marqdo wasm build`), links to CHANGELOG/README, extension branch note.
|
||||
5. Optional Linux local extras (not required if CI green): `marqdo wasm build` smoke; document in notes that wasm is built from source via CLI.
|
||||
```bash
|
||||
git tag -a "vVER" -m "vVER"
|
||||
git push origin "vVER"
|
||||
```
|
||||
|
||||
Local Windows fallback: `scripts/release-full.ps1 -Tag TAG -Upload` (see script header).
|
||||
Ext-only:
|
||||
|
||||
## Phase 6 — Post-release
|
||||
```bash
|
||||
git tag -a "ext-vVER" -m "ext-vVER"
|
||||
git push origin "ext-vVER"
|
||||
```
|
||||
|
||||
1. `gh release view TAG` — confirm assets + notes.
|
||||
2. `git status` clean; `main` synced.
|
||||
3. Tell user: release URL `https://github.com/cflmy/marqdo/releases/tag/TAG`.
|
||||
4. Optional: `./scripts/deploy-public.ps1` / pages workflow if user wants user-site refresh.
|
||||
5. Open fresh `## Unreleased` already done in Phase 2.
|
||||
(or build zips locally / via workflow and `gh release upload`).
|
||||
|
||||
If tag push needs the user:
|
||||
|
||||
```bash
|
||||
git push https://proxy.cflmy.top/github.com/cflmy/marqdo.git vVER
|
||||
```
|
||||
|
||||
## Phase 5 — GitHub Release notes & assets
|
||||
|
||||
1. Wait for Actions (full/cli): both `windows` and `linux` green when ext natives required.
|
||||
2. Rewrite release body 中英双语 — [reference.md § Notes](reference.md).
|
||||
3. Confirm Linux `marqdo-VER-native-x86_64-unknown-linux-gnu.zip` when mode ships ext.
|
||||
|
||||
## Phase 6 — Extension CDN (R2) — required when ext ships
|
||||
|
||||
```bash
|
||||
# credentials: ~/.marqdo/r2.env (never commit)
|
||||
python3 scripts/upload-ext-r2.py --version VER --from-dir dist/
|
||||
curl -fsS https://ext.marqdo.com/latest/VERSION
|
||||
```
|
||||
|
||||
Also ensure the **same** zips are on GitHub (`vVER` or `ext-vVER`). If R2 credentials missing, **tell the user**:
|
||||
|
||||
```bash
|
||||
# put keys in ~/.marqdo/r2.env then:
|
||||
python3 scripts/upload-ext-r2.py --version VER --from-dir dist/
|
||||
```
|
||||
|
||||
## Phase 7 — Ubuntu PPA (full/cli)
|
||||
|
||||
Linux CLI for apt users. After `Cargo.toml` is at `VER` and `debian/changelog` has a matching `VER-1ppaN` stanza:
|
||||
|
||||
```bash
|
||||
./scripts/ppa-ship.sh noble
|
||||
```
|
||||
|
||||
Packaging notes / noble Cargo.lock v4: [ubuntu-ppa.md](../../../doc/design/ubuntu-ppa.md).
|
||||
|
||||
**If the agent cannot sudo / sign / dput**, print exactly:
|
||||
|
||||
```bash
|
||||
cd ~/work/marqdo
|
||||
./scripts/ppa-ship.sh noble
|
||||
# or build then upload:
|
||||
./scripts/ppa-build-source.sh noble
|
||||
dput ppa:cflmy/marqdo ../build-area/marqdo_*~noble_source.changes
|
||||
```
|
||||
|
||||
Watch: https://launchpad.net/~cflmy/+archive/ubuntu/marqdo/+builds
|
||||
On Launchpad failure: read the build log, fix `debian/` or bundle script, bump `1ppaN`, re-upload. Tell the user the new `dput` command.
|
||||
|
||||
## Phase 8 — Post-release
|
||||
|
||||
1. `gh release view TAG` — assets + notes.
|
||||
2. CDN `https://ext.marqdo.com/vVER/` (if ext shipped).
|
||||
3. PPA build green (if cli shipped).
|
||||
4. Tell user URLs: GitHub release, CDN, PPA install one-liner.
|
||||
5. Optional gh-pages only if asked.
|
||||
|
||||
## Extension-only release (mode=ext)
|
||||
|
||||
1. User confirms **ext** SemVer (may differ from CLI).
|
||||
2. Bump `ext/VERSION`; CHANGELOG → `## Ext pack vVER`.
|
||||
3. Build/package `marqdo-VER-ext.zip` + `marqdo-VER-native-*.zip` (CI or local).
|
||||
4. Upload to **R2 and GitHub** (required both).
|
||||
5. Do **not** retag CLI / do **not** PPA unless user also asked for cli.
|
||||
|
||||
## Failure matrix (short)
|
||||
|
||||
| Failure | Action |
|
||||
|---------|--------|
|
||||
| `gh` / git TLS or proxy `7890` refused | Unset bad proxy; use working `HTTP(S)_PROXY` or `required_permissions: ["all"]`; see reference |
|
||||
| Tag exists | Stop; ask user to bump or delete tag (no force on shared tags without explicit order) |
|
||||
| CI red | Fix on main, move tag only if user explicitly allows delete+re-push tag |
|
||||
| VSIX missing | Fetch `vscode-extension`, build locally, `gh release upload TAG dist/*.vsix` |
|
||||
| Partial assets | Re-run workflow or upload missing files only |
|
||||
| `gh` / git TLS or Clash `7890` refused | Unset bad proxy; see [reference § Proxy](reference.md) |
|
||||
| GitHub blocked | proxy.cflmy.top, then HK jump; **print commands** if agent cannot push |
|
||||
| Tag exists | Stop; ask user |
|
||||
| CI red | Fix on main; retag only if user allows |
|
||||
| R2 upload fails | Print `upload-ext-r2.py` command; do not skip silently |
|
||||
| PPA / sudo / GPG | Print `./scripts/ppa-ship.sh noble` (or `dput …`); do not skip silently |
|
||||
| Launchpad `Cargo.lock` v4 / old cargo | Ensure bundled `third_party/rust` via current `ppa-build-source.sh`; bump `1ppaN` |
|
||||
| Linux native zip missing (full/ext) | Incomplete — fix linux job or upload |
|
||||
|
||||
## Do not
|
||||
|
||||
- Ship without user-confirmed version.
|
||||
- Hardcode release highlights only in Actions YAML and forget CHANGELOG.
|
||||
- Commit `target/`, `dist/`, `*.wasm`, or `public/**/*.html` unless project policy changes.
|
||||
- Ship without user-confirmed version (and mode when ambiguous).
|
||||
- Ship ext packs to only one of R2 / GitHub.
|
||||
- Call a full/cli release done without attempting PPA **or** giving the user the PPA commands.
|
||||
- Commit `target/`, `dist/`, `*.wasm`, `third_party/rust/`, or `public/**/*.html` unless policy changes.
|
||||
- Merge extension tree into `main`.
|
||||
@@ -25,21 +25,24 @@ gh release list --limit 3 2>/dev/null || true
|
||||
|
||||
## Asset matrix (CI tag `v*`)
|
||||
|
||||
Produced by `.github/workflows/release.yml` on **windows-latest**:
|
||||
Produced by `.github/workflows/release.yml` on **windows-latest** (`windows` job) and **ubuntu-latest** (`linux` job, **required**, `needs: windows`):
|
||||
|
||||
| Asset | Role |
|
||||
|-------|------|
|
||||
| `marqdo-VER-x86_64-pc-windows-msvc.exe` | CLI (stdlib embedded) |
|
||||
| `marqdo-VER-x86_64-pc-windows-msvc.zip` | `marqdo.exe` + `lib/` |
|
||||
| `marqdo-VER-stdlib.zip` | `lib/` only |
|
||||
| `marqdo-VER-ext.zip` | Official `ext/` L1 |
|
||||
| `marqdo-VER-native-x86_64-pc-windows-msvc.zip` | Prebuilt Windows plugins (`native/*.dll`) |
|
||||
| `marqdo-VER-native-x86_64-unknown-linux-gnu.zip` | Prebuilt Linux plugins (`native/lib*.so`) |
|
||||
| `marqdo-VER-source.zip` | `git archive` of tagged commit |
|
||||
| `marqdo-VER.vsix` | VS Code / Cursor (from branch `vscode-extension`) |
|
||||
| `marqdo-VER-public.zip` | Static user docs (`marqdo view output public`) |
|
||||
| Asset | Role | Job |
|
||||
|-------|------|-----|
|
||||
| `marqdo-VER-x86_64-pc-windows-msvc.exe` | CLI (stdlib embedded) | windows |
|
||||
| `marqdo-VER-x86_64-pc-windows-msvc.zip` | `marqdo.exe` + `lib/` + `ext/` + native DLL | windows |
|
||||
| `marqdo-VER-stdlib.zip` | `lib/` only | windows |
|
||||
| `marqdo-VER-ext.zip` | Official `ext/` L1 | windows |
|
||||
| `marqdo-VER-native-x86_64-pc-windows-msvc.zip` | Prebuilt Windows plugins (`native/*.dll`) | windows |
|
||||
| `marqdo-VER-native-x86_64-unknown-linux-gnu.zip` | Prebuilt Linux plugins (`native/lib*.so`) — **must ship** | linux |
|
||||
| `marqdo-VER-x86_64-unknown-linux-gnu.zip` | Linux CLI + `lib/` + `ext/` + native `.so` — **must ship** | linux |
|
||||
| `marqdo-VER-source.zip` | `git archive` of tagged commit | windows |
|
||||
| `marqdo-VER.vsix` | VS Code / Cursor (from branch `vscode-extension`) | windows |
|
||||
| `marqdo-VER-public.zip` | Static user docs (`marqdo view output public`) | windows |
|
||||
|
||||
Not CI-uploaded (document in notes): Linux/macOS build from source; WASM via `marqdo wasm build` → `dist/wasm/`.
|
||||
Not CI-uploaded (document in notes): macOS build from source; WASM via `marqdo wasm build` → `dist/wasm/`.
|
||||
|
||||
A release **without** the Linux native zip is incomplete (`marqdo ext add` on Linux cannot download prebuilts).
|
||||
|
||||
## Doc sync checklist (Phase 2 detail)
|
||||
|
||||
@@ -189,7 +192,9 @@ marqdo wasm build
|
||||
| Asset | 内容 / Contents |
|
||||
|-------|-----------------|
|
||||
| `marqdo-*-windows-msvc.exe` | CLI(内置 stdlib) |
|
||||
| `marqdo-*-windows-msvc.zip` | exe + `lib/` |
|
||||
| `marqdo-*-windows-msvc.zip` | exe + `lib/` + `ext/`(含 native) |
|
||||
| `marqdo-*-unknown-linux-gnu.zip` | Linux CLI + `lib/` + `ext/` + `.so` |
|
||||
| `marqdo-*-native-*.zip` | 预编译 `web`/`agent`/`quantum`/`linalg`(Win + **Linux 必出**) |
|
||||
| `marqdo-*-stdlib.zip` | 仅 `lib/` |
|
||||
| `marqdo-*-ext.zip` | 官方 `ext/` |
|
||||
| `marqdo-*-source.zip` | 源码快照 |
|
||||
@@ -206,14 +211,59 @@ marqdo wasm build
|
||||
|
||||
## Proxy & auth (network recovery)
|
||||
|
||||
Symptoms seen in this project: broken local proxy on `127.0.0.1:7890`, TLS failures, `gh` needing token, Cursor sandbox blocking git/gh.
|
||||
Symptoms seen in this project: broken local Clash on `127.0.0.1:7890`, flaky GitHub TLS, `gh` needing token, Cursor agent sandbox with only `lo`.
|
||||
|
||||
### `proxy.cflmy.top` (try this first)
|
||||
|
||||
This machine’s `origin` is typically:
|
||||
|
||||
```
|
||||
https://proxy.cflmy.top/github.com/cflmy/marqdo.git
|
||||
```
|
||||
|
||||
Push / fetch / tag through that remote (HTTPS reverse proxy to GitHub):
|
||||
|
||||
```bash
|
||||
git remote -v # confirm origin uses proxy.cflmy.top
|
||||
git push origin main
|
||||
git push origin vVER
|
||||
git push origin vscode-extension
|
||||
|
||||
# one-shot if origin still points at github.com:
|
||||
git push https://proxy.cflmy.top/github.com/cflmy/marqdo.git HEAD:main
|
||||
git push https://proxy.cflmy.top/github.com/cflmy/marqdo.git vVER
|
||||
```
|
||||
|
||||
Short GETs via the proxy often work; **long `git push` may still time out**. If push hangs or drops, skip Clash retries and go to **HK SSH jump** below.
|
||||
|
||||
`gh` / Release API can use the same path reverse-proxy:
|
||||
|
||||
| Path prefix | Upstream |
|
||||
|-------------|----------|
|
||||
| `/github.com/` | `https://github.com/` |
|
||||
| `/api.github.com/` | `https://api.github.com/` |
|
||||
| `/uploads.github.com/` | `https://uploads.github.com/` (Release asset POST; OpenResty on HK) |
|
||||
|
||||
```bash
|
||||
# Upload a Release asset through proxy.cflmy.top (Content-Type: application/octet-stream)
|
||||
curl -X POST \
|
||||
-H "Authorization: Bearer $GH_TOKEN" \
|
||||
-H "Accept: application/vnd.github+json" \
|
||||
-H "Content-Type: application/octet-stream" \
|
||||
--data-binary @dist/FILE.zip \
|
||||
"https://proxy.cflmy.top/uploads.github.com/repos/cflmy/marqdo/releases/RELEASE_ID/assets?name=FILE.zip"
|
||||
```
|
||||
|
||||
Do **not** rewrite `Host: uploads.github.com` against `proxy.cflmy.top` without the `/uploads.github.com/` path prefix — that returns 404.
|
||||
|
||||
### Diagnose
|
||||
|
||||
```bash
|
||||
env | grep -iE 'proxy|PROXY' || true
|
||||
curl -sI https://github.com | head -5
|
||||
curl -sI --max-time 15 https://github.com | head -5
|
||||
curl -sS --max-time 15 -o /dev/null -w 'proxy=%{http_code}\n' https://proxy.cflmy.top/ || true
|
||||
gh auth status
|
||||
ip -br addr | head -5 # agent may lack enp*; use required_permissions: ["all"]
|
||||
```
|
||||
|
||||
### Fix order
|
||||
@@ -222,6 +272,7 @@ gh auth status
|
||||
|
||||
```bash
|
||||
unset http_proxy https_proxy HTTP_PROXY HTTPS_PROXY ALL_PROXY all_proxy
|
||||
# also clear for one git call: git -c http.proxy= -c https.proxy= …
|
||||
```
|
||||
|
||||
2. **Set a working proxy** only if the user provides one (or known working):
|
||||
@@ -237,13 +288,15 @@ export HTTP_PROXY=http://HOST:PORT
|
||||
|
||||
5. **Git remote**: prefer `https://github.com/cflmy/marqdo.git`; SSH needs keys.
|
||||
|
||||
6. **Partial upload**:
|
||||
6. **HK SSH jump (preferred when GitHub is blocked but HK is reachable)** — see next subsection.
|
||||
|
||||
7. **Partial upload**:
|
||||
|
||||
```bash
|
||||
gh release upload "vVER" dist/FILE --clobber
|
||||
```
|
||||
|
||||
7. **Re-run CI** without retagging (if tag already correct):
|
||||
8. **Re-run CI** without retagging (if tag already correct):
|
||||
|
||||
```bash
|
||||
gh workflow run Release --ref "vVER" # only if workflow_dispatch exists; else fix + new patch tag
|
||||
@@ -251,6 +304,43 @@ gh workflow run Release --ref "vVER" # only if workflow_dispatch exists; else f
|
||||
|
||||
Current Release workflow is **tag-push only**. Red CI after tag → fix on `main`, then either new patch tag or **user-approved** delete+recreate tag (dangerous; prefer patch).
|
||||
|
||||
### HK SSH jump (Paramiko CONNECT)
|
||||
|
||||
**When to use:** local → GitHub fails (timeout / TLS / Clash flaky / reverse-proxy `proxy.cflmy.top` connect drops), but this host can reach an overseas box that has stable GitHub (default `hk.cflmy.de`). Proven path for v0.3.9 push/tag/`gh`.
|
||||
|
||||
**Do not** rely on OpenSSH + `sshpass` here — password auth has hung; use **Paramiko** (`python3-paramiko`).
|
||||
|
||||
**Never** commit the HK root password or tokens. Ask the user for the password (or a key), put it in env / a `600` temp file, scrub after.
|
||||
|
||||
```bash
|
||||
# one-shot password file (example — use the secret the user gave this session)
|
||||
printf '%s' "$HK_PASSWORD_FROM_USER" > /tmp/.hk_ssh_pw && chmod 600 /tmp/.hk_ssh_pw
|
||||
|
||||
export HK_SSH_HOST=hk.cflmy.de # or 83.229.126.119
|
||||
export HK_SSH_USER=root
|
||||
export HK_SSH_PASSWORD_FILE=/tmp/.hk_ssh_pw
|
||||
# optional: HK_JUMP_PORT=18081
|
||||
|
||||
SCRIPT=.cursor/skills/marqdo-release/scripts/push-via-hk-jump.py
|
||||
|
||||
# push / tag / extension (git gets CONNECT proxy + github.com askpass)
|
||||
python3 "$SCRIPT" -- git push origin main
|
||||
python3 "$SCRIPT" -- git push origin vscode-extension
|
||||
python3 "$SCRIPT" -- git push origin vVER
|
||||
|
||||
# gh (sets GH_TOKEN from git credential fill if unset)
|
||||
python3 "$SCRIPT" -- gh release edit vVER --notes-file /tmp/notes.md
|
||||
python3 "$SCRIPT" -- gh run list --workflow=Release --limit 3
|
||||
|
||||
# leave proxy up for manual commands
|
||||
python3 "$SCRIPT" --serve # then: export https_proxy=http://127.0.0.1:18081
|
||||
|
||||
rm -f /tmp/.hk_ssh_pw
|
||||
```
|
||||
|
||||
Script behavior: SSH to HK → local `http://127.0.0.1:$HK_JUMP_PORT` HTTP CONNECT via `direct-tcpip` → run `git`/`gh`/`curl` with that proxy. Git auth uses local `git credential` via `http.extraHeader` (Basic) — **not** `GIT_ASKPASS` (askpass has hung under agent/no TTY). Tokens never go to the jump host disk.
|
||||
|
||||
Optional path reverse-proxy (`https://proxy.cflmy.top/github.com/…` `insteadOf`) may work for short GETs; treat long `git push` failures as a signal to use the HK jump instead of retrying Clash forever.
|
||||
## Local Windows fallback
|
||||
|
||||
```powershell
|
||||
|
||||
+284
@@ -0,0 +1,284 @@
|
||||
#!/usr/bin/env python3
|
||||
"""Push / run git|gh through an HK SSH jump host (Paramiko HTTP CONNECT).
|
||||
|
||||
When this machine cannot reach GitHub reliably but can SSH to a host that can
|
||||
(e.g. hk.cflmy.de), open a local HTTP CONNECT proxy over Paramiko and run the
|
||||
remaining command with http(s).proxy pointed at it.
|
||||
|
||||
Why Paramiko: OpenSSH/`sshpass` has hung on password auth in this environment;
|
||||
Paramiko password + direct-tcpip works.
|
||||
|
||||
Credentials (never commit):
|
||||
HK_SSH_PASSWORD password string
|
||||
HK_SSH_PASSWORD_FILE file containing password (mode 600 recommended)
|
||||
or SSH key via Paramiko agent/keys if password unset and key works
|
||||
|
||||
Optional env:
|
||||
HK_SSH_HOST default hk.cflmy.de
|
||||
HK_SSH_USER default root
|
||||
HK_JUMP_PORT default 18081 (local CONNECT listen)
|
||||
|
||||
Usage:
|
||||
HK_SSH_PASSWORD_FILE=/tmp/hk.pw \\
|
||||
python3 .cursor/skills/marqdo-release/scripts/push-via-hk-jump.py -- \\
|
||||
git push origin main
|
||||
|
||||
# keep proxy only (Ctrl+C to stop)
|
||||
... push-via-hk-jump.py --serve
|
||||
|
||||
# wrap gh
|
||||
... push-via-hk-jump.py -- gh release view v0.3.9
|
||||
"""
|
||||
from __future__ import annotations
|
||||
|
||||
import os
|
||||
import select
|
||||
import socket
|
||||
import socketserver
|
||||
import subprocess
|
||||
import sys
|
||||
import threading
|
||||
import time
|
||||
from pathlib import Path
|
||||
|
||||
try:
|
||||
import paramiko
|
||||
except ImportError as e: # pragma: no cover
|
||||
raise SystemExit(
|
||||
"paramiko required: apt install python3-paramiko (or pip install paramiko)"
|
||||
) from e
|
||||
|
||||
ROOT = Path(__file__).resolve().parents[4]
|
||||
|
||||
|
||||
class _Server(socketserver.ThreadingMixIn, socketserver.TCPServer):
|
||||
allow_reuse_address = True
|
||||
daemon_threads = True
|
||||
|
||||
|
||||
def load_password() -> str | None:
|
||||
path = os.environ.get("HK_SSH_PASSWORD_FILE")
|
||||
if path:
|
||||
return Path(path).read_text(encoding="utf-8").strip()
|
||||
pw = os.environ.get("HK_SSH_PASSWORD")
|
||||
return pw.strip() if pw else None
|
||||
|
||||
|
||||
def connect_hk() -> paramiko.SSHClient:
|
||||
host = os.environ.get("HK_SSH_HOST", "hk.cflmy.de")
|
||||
user = os.environ.get("HK_SSH_USER", "root")
|
||||
pw = load_password()
|
||||
client = paramiko.SSHClient()
|
||||
client.set_missing_host_key_policy(paramiko.AutoAddPolicy())
|
||||
kwargs: dict = {
|
||||
"hostname": host,
|
||||
"username": user,
|
||||
"timeout": 20,
|
||||
"auth_timeout": 25,
|
||||
"banner_timeout": 25,
|
||||
}
|
||||
if pw:
|
||||
kwargs.update(password=pw, allow_agent=False, look_for_keys=False)
|
||||
else:
|
||||
kwargs.update(allow_agent=True, look_for_keys=True)
|
||||
print(f"== HK jump {user}@{host} ==", flush=True)
|
||||
client.connect(**kwargs)
|
||||
_, stdout, stderr = client.exec_command(
|
||||
"hostname; curl -sS --max-time 20 -o /dev/null -w gh=%{http_code} https://github.com/; echo"
|
||||
)
|
||||
out = stdout.read().decode()
|
||||
err = stderr.read().decode()
|
||||
print(out, end="" if out.endswith("\n") else "\n", flush=True)
|
||||
if err.strip():
|
||||
print(err, file=sys.stderr, flush=True)
|
||||
return client
|
||||
|
||||
|
||||
def make_proxy(transport: paramiko.Transport, port: int) -> _Server:
|
||||
class Handler(socketserver.StreamRequestHandler):
|
||||
def handle(self) -> None:
|
||||
try:
|
||||
first = self.rfile.readline(65536)
|
||||
if not first:
|
||||
return
|
||||
parts = first.decode("latin1", "replace").split()
|
||||
if len(parts) < 2 or parts[0].upper() != "CONNECT":
|
||||
self.wfile.write(b"HTTP/1.1 405 Method Not Allowed\r\n\r\n")
|
||||
return
|
||||
while True:
|
||||
line = self.rfile.readline(65536)
|
||||
if line in (b"\r\n", b"\n", b""):
|
||||
break
|
||||
host, _, port_s = parts[1].partition(":")
|
||||
chan = transport.open_channel(
|
||||
"direct-tcpip",
|
||||
(host, int(port_s or "443")),
|
||||
self.connection.getpeername(),
|
||||
)
|
||||
self.wfile.write(b"HTTP/1.1 200 Connection Established\r\n\r\n")
|
||||
sock = self.connection
|
||||
sock.setblocking(False)
|
||||
chan.setblocking(False)
|
||||
try:
|
||||
while True:
|
||||
r, _, x = select.select([sock, chan], [], [sock, chan], 120)
|
||||
if x:
|
||||
break
|
||||
if sock in r:
|
||||
data = sock.recv(65536)
|
||||
if not data:
|
||||
break
|
||||
chan.sendall(data)
|
||||
if chan in r:
|
||||
data = chan.recv(65536)
|
||||
if not data:
|
||||
break
|
||||
sock.sendall(data)
|
||||
finally:
|
||||
try:
|
||||
chan.close()
|
||||
except Exception:
|
||||
pass
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
return _Server(("127.0.0.1", port), Handler)
|
||||
|
||||
|
||||
def github_basic_auth_header() -> str:
|
||||
"""Authorization: Basic … from local git credential store (no askpass; askpass can hang)."""
|
||||
import base64
|
||||
|
||||
out = subprocess.check_output(
|
||||
["git", "credential", "fill"],
|
||||
input=b"protocol=https\nhost=github.com\n\n",
|
||||
).decode()
|
||||
data = dict(line.split("=", 1) for line in out.splitlines() if "=" in line)
|
||||
user = data.get("username") or "x-access-token"
|
||||
password = data.get("password") or ""
|
||||
if not password:
|
||||
raise SystemExit("no github.com credential in git credential store")
|
||||
token = base64.b64encode(f"{user}:{password}".encode()).decode()
|
||||
return f"Authorization: Basic {token}"
|
||||
|
||||
|
||||
def github_token() -> str | None:
|
||||
out = subprocess.check_output(
|
||||
["git", "credential", "fill"],
|
||||
input=b"protocol=https\nhost=github.com\n\n",
|
||||
).decode()
|
||||
data = dict(line.split("=", 1) for line in out.splitlines() if "=" in line)
|
||||
return data.get("password") or None
|
||||
|
||||
|
||||
def run_with_proxy(proxy: str, argv: list[str]) -> int:
|
||||
env = os.environ.copy()
|
||||
for k in (
|
||||
"http_proxy",
|
||||
"https_proxy",
|
||||
"HTTP_PROXY",
|
||||
"HTTPS_PROXY",
|
||||
"ALL_PROXY",
|
||||
"all_proxy",
|
||||
):
|
||||
env.pop(k, None)
|
||||
|
||||
cmd = list(argv)
|
||||
if cmd and cmd[0] == "git":
|
||||
# Prefer http.extraHeader over GIT_ASKPASS (askpass has hung under agent/no TTY).
|
||||
# Do not also set env http_proxy for git — only -c (avoids double-proxy quirks).
|
||||
auth = github_basic_auth_header()
|
||||
cmd = [
|
||||
"git",
|
||||
"-c",
|
||||
f"http.proxy={proxy}",
|
||||
"-c",
|
||||
f"https.proxy={proxy}",
|
||||
"-c",
|
||||
"credential.helper=",
|
||||
"-c",
|
||||
f"http.extraHeader={auth}",
|
||||
"-c",
|
||||
"http.version=HTTP/1.1",
|
||||
"-c",
|
||||
"http.postBuffer=524288000",
|
||||
*cmd[1:],
|
||||
]
|
||||
print(
|
||||
"+",
|
||||
" ".join(
|
||||
c if not str(c).startswith("http.extraHeader=") else "http.extraHeader=<redacted>"
|
||||
for c in cmd
|
||||
),
|
||||
flush=True,
|
||||
)
|
||||
return subprocess.call(cmd, cwd=ROOT, env=env)
|
||||
|
||||
env["http_proxy"] = proxy
|
||||
env["https_proxy"] = proxy
|
||||
env["HTTP_PROXY"] = proxy
|
||||
env["HTTPS_PROXY"] = proxy
|
||||
|
||||
if cmd and cmd[0] == "gh" and not env.get("GH_TOKEN"):
|
||||
tok = github_token()
|
||||
if tok:
|
||||
env["GH_TOKEN"] = tok
|
||||
|
||||
print("+", " ".join(cmd), flush=True)
|
||||
return subprocess.call(cmd, cwd=ROOT, env=env)
|
||||
|
||||
|
||||
def main(argv: list[str]) -> int:
|
||||
args = argv[1:]
|
||||
if not args or args[0] in ("-h", "--help"):
|
||||
print(__doc__)
|
||||
return 0 if args else 1
|
||||
|
||||
serve_only = args == ["--serve"]
|
||||
if args[0] == "--":
|
||||
args = args[1:]
|
||||
if not serve_only and not args:
|
||||
print("missing command after --", file=sys.stderr)
|
||||
return 2
|
||||
|
||||
port = int(os.environ.get("HK_JUMP_PORT", "18081"))
|
||||
client = connect_hk()
|
||||
transport = client.get_transport()
|
||||
assert transport is not None
|
||||
server = make_proxy(transport, port)
|
||||
threading.Thread(target=server.serve_forever, daemon=True).start()
|
||||
proxy = f"http://127.0.0.1:{port}"
|
||||
print(f"== CONNECT proxy {proxy} ==", flush=True)
|
||||
# smoke
|
||||
subprocess.call(
|
||||
[
|
||||
"curl",
|
||||
"-sS",
|
||||
"--connect-timeout",
|
||||
"10",
|
||||
"--max-time",
|
||||
"25",
|
||||
"--proxy",
|
||||
proxy,
|
||||
"-o",
|
||||
"/dev/null",
|
||||
"-w",
|
||||
"github=%{http_code}\\n",
|
||||
"https://github.com/",
|
||||
]
|
||||
)
|
||||
|
||||
try:
|
||||
if serve_only:
|
||||
print("serving; Ctrl+C to stop", flush=True)
|
||||
while transport.is_active():
|
||||
time.sleep(5)
|
||||
return 1
|
||||
return run_with_proxy(proxy, args)
|
||||
finally:
|
||||
server.shutdown()
|
||||
client.close()
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
raise SystemExit(main(sys.argv))
|
||||
@@ -15,28 +15,28 @@ description: >-
|
||||
|
||||
Marqdo = **Markdown markers as syntax**. A `.mq.md` file is both documentation and a runnable program. Read this skill **before** inventing syntax from Markdown habits or Python.
|
||||
|
||||
Canonical design (repo): `doc/design/markdown-mapping.md`, `doc/design/keywords.md`. Deeper tables: [reference.md](reference.md). Copy-paste patterns: [examples.md](examples.md).
|
||||
Canonical design (repo): [`markdown-mapping-v0.3.md`](../../doc/design/markdown-mapping-v0.3.md) (**v0.3 · runtime**), `doc/design/keywords.md`. Legacy v0.2 notes: `doc/design/markdown-mapping.md` (historical). Deeper tables: [reference.md](reference.md). Copy-paste patterns: [examples.md](examples.md).
|
||||
|
||||
**Authoring / library craft** (GFM-first, no json glue, how to develop Marqdo): use **[marqdo-dev](../marqdo-dev/SKILL.md)** whenever writing or refactoring `.mq.md`, `lib/*`, or `ext/*`.
|
||||
|
||||
**Product release** (tag, CHANGELOG, README, public docs, VSIX, GitHub assets): use [marqdo-release](../marqdo-release/SKILL.md) — detect latest version, **ask the user for the next SemVer**, then follow that playbook. Do not invent a version number.
|
||||
**Product release** (tag, CHANGELOG, README, public docs, VSIX, GitHub assets, **ext → R2+GitHub**, **CLI → Ubuntu PPA**): use [marqdo-release](../marqdo-release/SKILL.md) — detect versions, **ask for SemVer + mode (`full` / `cli` / `ext`)**, then follow that playbook. Ext-only releases are allowed. If sudo/GPG/PPA steps need the user, print the exact commands.
|
||||
|
||||
## Hard rules (do not violate)
|
||||
|
||||
1. **File suffix** must be `.mq.md` (never plain `.md` for executable sources).
|
||||
2. **Output is not `**bold**`.** Print with `> print text=…` (or `> 打印 内容=…`). Bold `**…**` is **return value only**.
|
||||
3. **Prose vs code:** after a blank line, an unmarked first line starts a **comment paragraph**; every following non-blank line stays comment until the next blank line. Put a **blank line** between narration and executable lines.
|
||||
4. **Do not invent keywords** `if` / `else` / `while` / `for` / `def` / `return`. Control flow is Markdown: **`+` params** (under heading), **`1.` `2.` … branches**, **`-` loops**, arm `N. *` = else, `#` = **object/type**, `##`+ = **function/method**, `**…**` = return.
|
||||
5. **Identifiers use backticks** — params `` + `name` ``. **Exemptions:** foreach `` - [item](coll) ``; footnote `` name[^key] ``; **inside italic `*…*` / bold `**…**`**, bare ids are **variables** (Python-style unified namespace) and method-call receivers are bare too. **Drop the backticks on value-expression variable names and method receivers inside `*…*` / `**…**`** — they are redundant once the `*…*`/`**…**` markers mark the segment as code: `*分类 = 分类[^苹果]*`, `**n * 2**`, `*p = > page.主体装配 组件=home*`. **Text literals must be quoted**: `*a = > text.split value=src sep=","*`. Backticks **still required** where a bare word is *not* a variable in **standalone `>` calls** (bare = text there): `` > str `n` ``, `` > `obj`.method ``. **No trailing space** inside `*…*` / `**…**` wrapped code: the closing marker must touch the last token directly (`*a = 1*`, `**n**`), never `` *a = 1 * ``.
|
||||
6. **Structure lines are not wrapped in italics.** `#` `>` `+` `-` `|` lines stand alone; use `*…*` only for general statements (bindings / expressions).
|
||||
7. **Paths:** In bare *expressions* `/` is division. In **call args / param defaults / table cells**, unspaced `a/b` and quoted `".marqdo/agent-kb"` are path text — no `json.parse` needed. Numeric ratios that must stay text use quotes (`"1/5"`, `"16/9"`); bare `1/5` is division.
|
||||
8. Prefer ending side-effect-only function bodies with a lone `---` or `***` line (or `****` empty return) so later siblings are not swallowed.
|
||||
2. **`**…**` = code** (assign / call). **`*…*` = return value**. Output is **not** either marker — use `> print text=…` / `**print text="…"**` / `> 打印 内容=…`.
|
||||
3. **Prose:** unmarked narrative may contain `` `名` `` (declare/ref), inline `**code**`, and `*return*`. Soft Markdown emphasis that is **not** code-shaped (`**说明**`, mid-line `*only*`) is ignored — see [code-as-docs-gaps.md](../../doc/design/code-as-docs-gaps.md). Dead `` `名` `` (never read) is OK and does not become a param.
|
||||
4. **Do not invent keywords** `if` / `else` / `while` / `for` / `def` / `return`. Control flow is Markdown: **`1.` `2.` … branches**, **`-` loops**, arm `N. *` = else, `#` = **object/type**, `##`+ = **function/method**. Params: prefer prose `` `名` `` / `` `名`=默认 `` (inferred); `` + `名` `` still accepted.
|
||||
5. **Identifiers:** `` `名` `` in prose; inside `*…*` / `**…**`, bare ids are **variables**. **Text literals must be quoted** in bold/italic: `**print text="hi"**`. Standalone `>` calls: bare words = text; vars need ticks: `` > str `n` ``.
|
||||
6. **Structure lines** (`#` `>` `+` `-` `|` `1.`) need not be wrapped in bold.
|
||||
7. **Paths:** In bare expressions `/` is division. In call args / defaults / table cells, unspaced `a/b` and quoted paths are text.
|
||||
8. Prefer ending side-effect-only bodies with `*None*` / `*无*` / whole-line `**` / `****` when the next lines must belong to an outer function. Lone `---` / `***` are Markdown thematic breaks (skipped everywhere), not function end.
|
||||
9. **`ext/**` never calls `host_*`.** Agent/OKF helpers are plugin names (`agent_kb_*`, …) after `plugin.load`. Do **not** add agent/OKF domain code to `src/host/` (core bloat). See `doc/design/ext-agent.md` §4.
|
||||
10. **Browser (route C/D/E/F):** client logic is Marqdo on WASM; official bridge is host glue and **may** implement lists, routing, storage, WebSocket, canvas, file read, observers — authors **must not hand-write business JS**. Use `web.client_embed` / `data-mq-source-url` auto-mount. Client effects: prefer **GFM tables + `lib/browser`** ([marqdo-dev](../marqdo-dev/SKILL.md)).
|
||||
11. **Code-as-documentation / no bag glue:** Prefer **GFM tables** for maps, lists, wire, commands. Prefer **`table.put` / named helpers** over `json.set` / `json.append` chains. `lib/json` is for parse/stringify/quote only — not a dict builder. Unreadable json pipelines are a style bug.
|
||||
12. **Bracket-marked calls:** Function name may be marked with `[函数名]`; bare words before `[` are boolean modifiers (`礼貌 [问候] x` → `礼貌=True`). `]` immediately followed by `(` is **index** `[key](coll)`, not a call. Prefer `[k](c)` over footnote index in new code. See [bracket-call-modifiers.md](../../doc/design/bracket-call-modifiers.md).
|
||||
|
||||
|
||||
## Markup → meaning (v0.2)
|
||||
## Markup → meaning (v0.3)
|
||||
|
||||
| Marker | Meaning |
|
||||
|--------|---------|
|
||||
@@ -47,15 +47,17 @@ Canonical design (repo): `doc/design/markdown-mapping.md`, `doc/design/keywords.
|
||||
| `- …` inside body | Loop (`while` or `` [item](coll) `` / `` [`item`](`coll`) ``) |
|
||||
| Line `N. *` | Else arm |
|
||||
| `> fn args` | Call (named `k=v` or positional) |
|
||||
| `修饰 [fn] args` | Bracket-marked call; leading words → `名=True` |
|
||||
| `` > `obj`.method args `` | Method call (`obj` must be a map with `_type`) |
|
||||
| Frontmatter `import bind:path.mq.md` / `导入` | Import file (bind library name) |
|
||||
| Frontmatter `import bind:lib.member` / `导入` | Short name for a library member (same keyword; no separate `use`) |
|
||||
| `> lib.member …` / `> lib.Type.member …` | Call via bare dotted path (instance methods need `` `var`.m ``) |
|
||||
| `*…*` | Statement (bind / expr) — closing `*` touches last token, **no trailing space**; bare ids are variables |
|
||||
| `**…**` | Return value — closing `**` touches last token, **no trailing space**; bare ids are variables |
|
||||
| `****` or `**` + spaces + `**` | Return `None` and end function body |
|
||||
| Lone `---` / `***` in function body | End function body (no value) |
|
||||
| GFM table after empty RHS bind | Collection (1-col list / ≥2-col map / `@`·`行`·`row` → list of maps); `` `x`[^1] `` / `` `m`[^key] `` |
|
||||
| `**…**` | **Code** (assign / call) — closing `**` touches last token; bare ids are variables; quote text literals |
|
||||
| `*…*` | **Return value** — closing `*` touches last token; bare ids are variables |
|
||||
| `****` / whole-line `**` / `*None*` | Return `None` and end function body |
|
||||
| Lone `---` / `***` | Markdown thematic break (skip; not function end) |
|
||||
| GFM table after empty RHS bind | Collection; get with `[key](coll)` (preferred) or legacy `` `m`[^key] `` |
|
||||
| `- [item](coll)` | Foreach (unchanged) |
|
||||
| `` ```lang `` | Foreign code block (via `lib/foreign`) |
|
||||
| `` `"text"` `` | Quoted string (`\n` `\t` `\\` `\"`; `` `var` `` inside); bare tokens unescaped |
|
||||
| Unmarked prose | Comment |
|
||||
@@ -90,27 +92,28 @@ Chinese builtins (same functions, no import):
|
||||
|
||||
> print text=Hello, `who`!
|
||||
|
||||
---
|
||||
*None*
|
||||
```
|
||||
|
||||
- Call: `> name key=value` or `> name value`.
|
||||
- Nested helpers use deeper `#` (`##`, `###`, …).
|
||||
- After a helper with only side effects, end with `---` / `***`.
|
||||
- After a helper with only side effects, end with `*None*` / whole-line `**` / `****` when later lines must stay in the outer function. Lone `---` is only a thematic break (skipped).
|
||||
- In bold assigns, prefer bare calls: `**摘要 = 结账摘要 …**` (omit `>`).
|
||||
|
||||
## Statements, returns, branches
|
||||
|
||||
```markdown
|
||||
*x = 1*
|
||||
*y = x + 2*
|
||||
**x = 1**
|
||||
**y = x + 2**
|
||||
|
||||
## add_one
|
||||
+ `n`
|
||||
|
||||
**n + 1**
|
||||
*n + 1*
|
||||
```
|
||||
|
||||
```markdown
|
||||
*n = 0*
|
||||
**n = 0**
|
||||
|
||||
1. `n` > 0
|
||||
> print text=positive
|
||||
@@ -133,9 +136,9 @@ import clock:lib/time.mq.md
|
||||
|
||||
# main
|
||||
|
||||
*xs = > text.split value="a,b,c" sep=","*
|
||||
**xs = > text.str_split s="a,b,c" sep=","**
|
||||
> print text=`xs`
|
||||
*t = > clock.now_unix*
|
||||
**t = > clock.now_unix**
|
||||
```
|
||||
|
||||
- Import **English** or **Chinese** library file; call that file’s API names via `lib.member` (do not mix languages).
|
||||
@@ -177,7 +180,7 @@ Import **one language file** — never mix EN/ZH API names in the same `.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.
|
||||
- **`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).
|
||||
|
||||
**Typical layout:**
|
||||
@@ -196,7 +199,7 @@ data/ # sqlite runtime (gitignore)
|
||||
|
||||
**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`).
|
||||
**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`).
|
||||
|
||||
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/).
|
||||
|
||||
@@ -257,7 +260,7 @@ Examples: [linalg-svd](../../examples/linalg-svd/) · [linalg-least-squares](../
|
||||
| `* > print text=hi *` | `> print text=hi` |
|
||||
| `` *`a` = 1 * `` (trailing space + backticks) | `*a = 1*` — bare bind, no trailing space before `*` / `**` |
|
||||
| `*xs = > text.split value=a,b sep=,*` (bare text args) | `*xs = > text.split value="a,b" sep=","*` — quote text literals; bare words are variables |
|
||||
| Forgetting `---` after nested `##` helper | Add `---` / `***` / `****` |
|
||||
| Forgetting empty return after nested `##` helper when outer continues | Add `*None*` / `**` / `****` (not `---`) |
|
||||
| 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.*`) |
|
||||
@@ -277,7 +280,7 @@ Examples: [linalg-svd](../../examples/linalg-svd/) · [linalg-least-squares](../
|
||||
- [ ] Print via `print` / `打印`, not bold
|
||||
- [ ] Blank lines separate comment paragraphs from code
|
||||
- [ ] `# main` exists when the file is an entry program
|
||||
- [ ] Nested functions ended with `---` / `***` / `****` when needed
|
||||
- [ ] Nested side-effect helpers ended with `*None*` / `**` / `****` when the outer function continues
|
||||
- [ ] Imports and call names share the same language file
|
||||
- [ ] Data shaped as **GFM tables** (or short helpers) — no `json.set` / `json.append` glue
|
||||
- [ ] Web sites: tables + web classes only (no JSON glue); `data/` gitignored
|
||||
|
||||
@@ -1,5 +1,7 @@
|
||||
# Marqdo examples (AI)
|
||||
|
||||
v0.3: `**…**` = code (assign / call); `*…*` = return. Prefer `[key](coll)` over footnote get. Bracket calls: `礼貌 [问候] x`.
|
||||
|
||||
## 1. Hello (English)
|
||||
|
||||
```markdown
|
||||
@@ -16,7 +18,7 @@
|
||||
> 打印 内容=你好,世界!
|
||||
```
|
||||
|
||||
## 3. Function + named call + body end
|
||||
## 3. Function + named call + empty return
|
||||
|
||||
```markdown
|
||||
# main
|
||||
@@ -30,22 +32,24 @@ Greeting via a nested function:
|
||||
|
||||
> print text=Hello, `who`!
|
||||
|
||||
---
|
||||
*None*
|
||||
```
|
||||
|
||||
Or end with a whole-line empty bold return: `**` / `****`. Lone `---` is a thematic break (skipped), not function end.
|
||||
|
||||
## 4. Bindings and return
|
||||
|
||||
```markdown
|
||||
# main
|
||||
|
||||
*a = 2*
|
||||
*b = > add_one n=`a`*
|
||||
> print text=`b`
|
||||
**a = 2**
|
||||
**b = add_one n=`a`**
|
||||
**打印 内容=`b`**
|
||||
|
||||
## add_one
|
||||
+ `n`
|
||||
|
||||
**n + 1**
|
||||
*n + 1*
|
||||
```
|
||||
|
||||
## 5. Branch with else
|
||||
@@ -53,7 +57,7 @@ Greeting via a nested function:
|
||||
```markdown
|
||||
# main
|
||||
|
||||
*n = 0*
|
||||
**n = 0**
|
||||
|
||||
1. `n` > 0
|
||||
> print text=positive
|
||||
@@ -78,8 +82,7 @@ Greeting via a nested function:
|
||||
> print text=`果`
|
||||
```
|
||||
|
||||
|
||||
## 6b. Map table + footnote get
|
||||
## 6b. Map table + link-index get
|
||||
|
||||
```markdown
|
||||
# main
|
||||
@@ -90,13 +93,20 @@ Greeting via a nested function:
|
||||
|------|------|
|
||||
| 水果 | 蔬菜 |
|
||||
|
||||
*种 = 分类[^苹果]*
|
||||
> print text=`种`
|
||||
**种 = [苹果](分类)**
|
||||
**打印 内容=`种`**
|
||||
|
||||
*第一 = 篮子[^1]*
|
||||
`篮子` =
|
||||
|
||||
| 果 |
|
||||
|----|
|
||||
| 苹果 |
|
||||
|
||||
**第一 = [1](篮子)**
|
||||
**打印 内容=`第一`**
|
||||
```
|
||||
|
||||
One column → list; ≥2 columns + one data row → map; ≥2 columns + many rows → map of lists. Data cells are expressions (same as call-arg values): bare words, numbers, `` `var` ``, quoted strings; URLs and `gpt-4o-mini` stay text via path/hyphen folding. Footnotes: lists use 1-based digit indices; maps use key text (including digit keys like `[^00]`). Foreach on a map walks **keys**.
|
||||
One column → list; ≥2 columns + one data row → map; ≥2 columns + many rows → map of lists. Prefer `[key](coll)` (lists are 1-based). Legacy `` coll[^key] `` still parses. Foreach on a map walks **keys**.
|
||||
|
||||
Row-oriented records (SQL-like): first header `@` / `行` / `row` → list of maps (marker column excluded):
|
||||
|
||||
@@ -107,10 +117,27 @@ Row-oriented records (SQL-like): first header `@` / `行` / `row` → list of ma
|
||||
|----|------|------|
|
||||
| 1 | 苹果 | 2 |
|
||||
|
||||
*名 = 订单[^1][^品名]*
|
||||
**名 = [品名]([1](订单))**
|
||||
```
|
||||
|
||||
## 6c. Browser effects — tables + lib/browser (not json.set)
|
||||
## 6c. Bracket-marked call + modifiers
|
||||
|
||||
```markdown
|
||||
# main
|
||||
|
||||
**打印 内容=(礼貌 [问候] "Marqdo")**
|
||||
|
||||
## 问候
|
||||
+ `谁`
|
||||
+ `礼貌`=False
|
||||
|
||||
**出 = `礼貌` + ", " + `谁` + "!"**
|
||||
*出*
|
||||
```
|
||||
|
||||
`礼貌 [问候] …` → `礼貌=True`. `]` immediately followed by `(` is index, not a call.
|
||||
|
||||
## 6d. Browser effects — tables + lib/browser (not json.set)
|
||||
|
||||
```markdown
|
||||
---
|
||||
@@ -128,8 +155,8 @@ import browser:lib/browser.mq.md
|
||||
**`wire`**
|
||||
|
||||
## bump
|
||||
*`count` = count + 1*
|
||||
*`label` = > str count*
|
||||
**count = count + 1**
|
||||
**label = str count**
|
||||
**> browser.set_text sel="#count" text=label**
|
||||
```
|
||||
|
||||
@@ -145,8 +172,8 @@ import text:lib/text.mq.md
|
||||
|
||||
# main
|
||||
|
||||
*parts = > split value=a,b,c sep=,*
|
||||
> print text=`parts`
|
||||
**parts = [text.str_split] s="a,b,c" sep=","**
|
||||
**打印 内容=`parts`**
|
||||
```
|
||||
|
||||
## 7b. Mid M1 — regex + encoding (no plugin)
|
||||
@@ -159,10 +186,10 @@ import enc:lib/encoding.mq.md
|
||||
|
||||
# main
|
||||
|
||||
*`ok` = > re.is_match text="a@b.c" pattern="@"*
|
||||
*`b64` = > enc.base64_encode text="hi"*
|
||||
> print text=`ok`
|
||||
> print text=`b64`
|
||||
**`ok` = [re.is_match] text="a@b.c" pattern="@"**
|
||||
**`b64` = [enc.base64_encode] text="hi"**
|
||||
**打印 内容=`ok`**
|
||||
**打印 内容=`b64`**
|
||||
```
|
||||
|
||||
## 7c. Mid M6 — log + uuid
|
||||
@@ -178,8 +205,8 @@ import uuid:lib/uuid.mq.md
|
||||
> log.info text="start"
|
||||
> log.set_level level="debug"
|
||||
> log.debug text="detail"
|
||||
*id = > uuid.v4*
|
||||
> print text=`id`
|
||||
**id = [uuid.v4]**
|
||||
**打印 内容=`id`**
|
||||
```
|
||||
|
||||
## 8. Comment paragraphs (blank-line rule)
|
||||
@@ -188,7 +215,7 @@ import uuid:lib/uuid.mq.md
|
||||
# main
|
||||
|
||||
This whole paragraph is a comment, including lines that look like code:
|
||||
*not_executed = 1*
|
||||
**not_executed = 1**
|
||||
> print text=also still comment
|
||||
|
||||
After a blank line, code runs:
|
||||
@@ -206,13 +233,13 @@ import math:lib/math.mq.md
|
||||
|
||||
# main
|
||||
|
||||
*t = > num value=3.5*
|
||||
> print text=`t`
|
||||
**t = > num value=3.5**
|
||||
**打印 内容=`t`**
|
||||
```
|
||||
|
||||
## 10. Object handle + method
|
||||
|
||||
See `tests/structure/object-handle.mq.md` and `ext/llm.mq.md`: `# Type` constructs a map with `_type`; methods use `` > `obj`.method `` and read `self` / `自`.
|
||||
See `tests/structure/object-handle.mq.md` and `ext/ai/llm.mq.md`: `# Type` constructs a map with `_type`; methods use `` > `obj`.method `` and read `self` / `自`.
|
||||
|
||||
## 10b. Object inheritance
|
||||
|
||||
@@ -222,16 +249,16 @@ See `tests/structure/object-handle.mq.md` and `ext/llm.mq.md`: `# Type` construc
|
||||
## hello
|
||||
+ `who`
|
||||
|
||||
*msg = "Hello, `who`!"*
|
||||
**msg**
|
||||
**msg = "Hello, `who`!"**
|
||||
*msg*
|
||||
|
||||
# Loud = > Greeter
|
||||
|
||||
## hello
|
||||
+ `who`
|
||||
|
||||
*msg = "HELLO, `who`!"*
|
||||
**msg**
|
||||
**msg = "HELLO, `who`!"**
|
||||
*msg*
|
||||
```
|
||||
|
||||
`_type` stays the most specific name (`Loud`). Methods walk the base chain; same-name `##` on the child overrides. **No implicit super** — if the child needs parent fields, call the parent explicitly:
|
||||
@@ -240,9 +267,9 @@ See `tests/structure/object-handle.mq.md` and `ext/llm.mq.md`: `# Type` construc
|
||||
# Child = > Parent
|
||||
+ `name`
|
||||
|
||||
*self = > Parent name=`name`*
|
||||
*self = > json.set map=`self` key=extra value=1*
|
||||
**self**
|
||||
**self = > Parent name=`name`**
|
||||
**self = [table.put] in=`self` at="extra" value=1**
|
||||
*self*
|
||||
```
|
||||
|
||||
## 11. Agent layout (ABI)
|
||||
@@ -256,9 +283,9 @@ import agent:ext/agent.mq.md
|
||||
|
||||
> load_native
|
||||
|
||||
*ws = > agent*
|
||||
*n = > `ws`.ensure_layout*
|
||||
> print text=`n`
|
||||
**ws = > agent**
|
||||
**n = > `ws`.ensure_layout**
|
||||
**打印 内容=`n`**
|
||||
```
|
||||
|
||||
Requires `MARQDO_AGENT_PLUGIN` pointing at the built `agent` shared library (see `doc/design/ext-agent.md`).
|
||||
@@ -266,14 +293,14 @@ Requires `MARQDO_AGENT_PLUGIN` pointing at the built `agent` shared library (see
|
||||
## 12. What not to emit
|
||||
|
||||
```markdown
|
||||
# BAD — bold is return, not print
|
||||
# BAD — bare bold that is not code-shaped (decorative OK); do not use bold/italic as print
|
||||
**Hello**
|
||||
|
||||
# BAD — Python control keywords
|
||||
if x > 0:
|
||||
print(x)
|
||||
|
||||
# BAD — wrapping a call in italics
|
||||
# BAD — wrapping a call in italics as if it were a statement
|
||||
*> print text=hi*
|
||||
|
||||
# BAD — old branch syntax (removed)
|
||||
@@ -290,6 +317,10 @@ if x > 0:
|
||||
> print text=y-pos
|
||||
2. *
|
||||
> print text=y-other
|
||||
|
||||
# GOOD — print / return
|
||||
**打印 内容="hi"**
|
||||
*n + 1*
|
||||
```
|
||||
|
||||
## 13. Dynamic site (ext/web, minimal)
|
||||
@@ -316,14 +347,14 @@ import db:db/index.mq.md
|
||||
| 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"*
|
||||
**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`
|
||||
```
|
||||
|
||||
@@ -347,13 +378,13 @@ import quantum:ext/quantum/quantum.mq.md
|
||||
| 1 | H | 0 |
|
||||
| 2 | CX | 0,1 |
|
||||
|
||||
*qc = > quantum.circuit qubits=2 steps=`steps`*
|
||||
*rho = > `qc`.density*
|
||||
*red = > `rho`.partial_trace keep=0*
|
||||
*sch = > `qc`.schmidt cut=1*
|
||||
*_ = > `qc`.draw kind="circuit" theme="dark"*
|
||||
*_ = > `qc`.draw kind="hinton"*
|
||||
> print text=`red`
|
||||
**qc = > quantum.circuit qubits=2 steps=`steps`**
|
||||
**rho = > `qc`.density**
|
||||
**red = > `rho`.partial_trace keep=0**
|
||||
**sch = > `qc`.schmidt cut=1**
|
||||
**_ = > `qc`.draw kind="circuit" theme="dark"**
|
||||
**_ = > `qc`.draw kind="hinton"**
|
||||
**打印 内容=`red`**
|
||||
```
|
||||
|
||||
- Full lab: `examples/quantum-entanglement/`. Bell-only: `examples/quantum-bell/`.
|
||||
@@ -369,19 +400,18 @@ import la:ext/linalg/linalg.mq.md
|
||||
|
||||
# main
|
||||
|
||||
*`A` = > la.symbol name="A" rows=2 cols=2*
|
||||
*`B` = > la.symbol name="B" rows=2 cols=2*
|
||||
*`C` = `A` + `B`*
|
||||
*`P` = `A` * `B`*
|
||||
*`s` = > `P`.T.simplify* <!-- prefer: *`Pt` = > `P`.T* then simplify -->
|
||||
**`A` = > la.symbol name="A" rows=2 cols=2**
|
||||
**`B` = > la.symbol name="B" rows=2 cols=2**
|
||||
**`C` = `A` + `B`**
|
||||
**`P` = `A` * `B`**
|
||||
```
|
||||
|
||||
Prefer:
|
||||
|
||||
```markdown
|
||||
*`env` = > la.declare table=`shapes`*
|
||||
*`P` = env[^A] * env[^B]*
|
||||
*`t` = > `P`.T_ascii*
|
||||
**`env` = > la.declare table=`shapes`**
|
||||
**`P` = [A](env) * [B](env)**
|
||||
**`t` = > `P`.T_ascii**
|
||||
```
|
||||
|
||||
- Infix `+` / `-` / `*`;`ascii` / `T_ascii` 默认化简(`raw=True` 可关)。
|
||||
|
||||
@@ -18,7 +18,7 @@ marqdo ext remove llm|agent|web|quantum|linalg
|
||||
|
||||
Diagnostics look like `path:line:col: message` (1-based line/col).
|
||||
|
||||
**v0.2 surface:** parameters `` + `name` ``; branches `` 1. `cond` `` / `` 2. * `` (same-indent restart at `1.` = **new** branch statement); loops `` - [item](coll) `` or `` - [`item`](`coll`) ``; identifiers in backticks (foreach header may omit ticks). See `doc/design/markdown-mapping.md`.
|
||||
**v0.3 surface:** `**…**` = code; `*…*` = return; parameters `` + `name` `` (or prose-inferred); branches `` 1. `cond` `` / `` 2. * `` (same-indent restart at `1.` = **new** branch statement); loops `` - [item](coll) ``; get `` [key](coll) ``; bracket calls `` mod [fn] args ``. See `doc/design/markdown-mapping-v0.3.md`.
|
||||
|
||||
Stdlib search order for `lib/…` imports: `MARQDO_LIB`, `./lib`, directory of the `marqdo` executable (and a few parents). Prefer the **bundle zip** (`marqdo.exe` + `lib/`) over a bare exe.
|
||||
|
||||
@@ -183,7 +183,8 @@ See `doc/design/call-arguments.md`.
|
||||
|
||||
| Doc | Topic |
|
||||
|-----|--------|
|
||||
| `doc/design/markdown-mapping.md` | Syntax constitution |
|
||||
| `doc/design/markdown-mapping-v0.3.md` | Syntax constitution (runtime) |
|
||||
| `doc/design/markdown-mapping.md` | Legacy v0.2 notes |
|
||||
| `doc/design/objects.md` | `#` objects / `##` methods |
|
||||
| `doc/design/keywords.md` | Builtins / keywords |
|
||||
| `doc/design/return-hr-and-code-surface.md` | Function end / surfaces |
|
||||
|
||||
@@ -0,0 +1,9 @@
|
||||
# Ext CDN / R2 (Cloudflare) — copy to ~/.marqdo/r2.env and chmod 600
|
||||
# Never commit real keys. Public downloads: https://ext.marqdo.com
|
||||
|
||||
R2_ACCOUNT_ID=
|
||||
R2_BUCKET=marqdo
|
||||
R2_ENDPOINT=https://<accountid>.r2.cloudflarestorage.com
|
||||
R2_ACCESS_KEY_ID=
|
||||
R2_SECRET_ACCESS_KEY=
|
||||
R2_PUBLIC_BASE=https://ext.marqdo.com
|
||||
@@ -20,15 +20,26 @@ jobs:
|
||||
- name: Install Rust
|
||||
uses: dtolnay/rust-toolchain@stable
|
||||
|
||||
- name: Install Go (web plugin)
|
||||
uses: actions/setup-go@v5
|
||||
with:
|
||||
go-version: "1.23.x"
|
||||
|
||||
- name: Install Node (VS Code extension)
|
||||
uses: actions/setup-node@v4
|
||||
with:
|
||||
node-version: "20"
|
||||
|
||||
- name: Install MinGW for cgo (web.dll)
|
||||
run: choco install mingw -y
|
||||
|
||||
- name: Build release CLI + official plugins
|
||||
shell: bash
|
||||
run: |
|
||||
export PATH="/c/ProgramData/mingw64/mingw64/bin:/c/ProgramData/chocolatey/lib/mingw/tools/install/mingw64/bin:$PATH"
|
||||
cargo build --release
|
||||
cargo build --release -p marqdo_plugin_web -p marqdo_plugin_agent -p marqdo_plugin_quantum -p marqdo_plugin_linalg
|
||||
cargo build --release -p marqdo_plugin_agent -p marqdo_plugin_quantum -p marqdo_plugin_linalg
|
||||
bash ./scripts/build-web-plugin.sh
|
||||
|
||||
- name: Checkout extension sources (branch vscode-extension only)
|
||||
run: git fetch origin vscode-extension && git checkout origin/vscode-extension -- vscode-extension
|
||||
@@ -113,10 +124,11 @@ jobs:
|
||||
## Marqdo ${{ github.ref_name }}
|
||||
|
||||
### 亮点 / Highlights
|
||||
- **中层标准库 Mid2**:datetime/url · toml/html/base32 · fs++ · stats/log.fields(M7–M10)
|
||||
- **Mid2 stdlib**: calendar/URL, TOML/HTML/base32, thicker fs, thin stats + log fields
|
||||
- **修复**:嵌套插件调用后恢复 `GLOBAL_HOST`(listen/invoke)
|
||||
- Details: [CHANGELOG](https://github.com/cflmy/marqdo/blob/main/CHANGELOG.md) · [stdlib-mid2.md](https://github.com/cflmy/marqdo/blob/main/doc/roadmap/stdlib-mid2.md)
|
||||
- **v1.0.3**:Ubuntu PPA + 扩展 CDN(ext.marqdo.com);CLI/扩展可分发;noble 捆绑 Rust 工具链
|
||||
- **v1.0.3**: Ubuntu PPA + extension CDN; independent CLI/ext packs; bundled Rust for noble
|
||||
- **v1.0.1**:修复 Go `libweb` 动态路由 `{param}` 查询代入、详情 Markdown、CSS 数字误报
|
||||
- **Linux 包必出**:`*-native-x86_64-unknown-linux-gnu.zip` + Linux CLI bundle
|
||||
- Details: [CHANGELOG](https://github.com/cflmy/marqdo/blob/main/CHANGELOG.md) · [mapping v0.3](https://github.com/cflmy/marqdo/blob/main/doc/design/markdown-mapping-v0.3.md)
|
||||
|
||||
### Downloads
|
||||
|
||||
@@ -124,7 +136,8 @@ jobs:
|
||||
|-------|----------|
|
||||
| `marqdo-*-windows-msvc.exe` | CLI with **embedded** official stdlib |
|
||||
| `marqdo-*-windows-msvc.zip` | `marqdo.exe` + `lib/` + `ext/`(含 native DLL) |
|
||||
| `marqdo-*-native-*.zip` | 预编译 `web`/`agent`/`quantum` 插件 |
|
||||
| `marqdo-*-native-*.zip` | 预编译 `web`/`agent`/`quantum`/`linalg`(Windows DLL + **Linux .so 必出**) |
|
||||
| `marqdo-*-unknown-linux-gnu.zip` | Linux CLI + `lib/` + `ext/` + native `.so` |
|
||||
| `marqdo-*-stdlib.zip` | `lib/` only |
|
||||
| `marqdo-*-ext.zip` | Official `ext/` L1 sources |
|
||||
| `marqdo-*-source.zip` | Source snapshot (`git archive`) |
|
||||
@@ -145,34 +158,67 @@ jobs:
|
||||
env:
|
||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
|
||||
linux-native:
|
||||
linux:
|
||||
runs-on: ubuntu-latest
|
||||
# Wait until Windows has created the GitHub Release, then attach Linux zips
|
||||
# (required: native plugins for `marqdo ext add` on Linux + CLI bundle).
|
||||
needs: windows
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
|
||||
- name: Install Rust
|
||||
uses: dtolnay/rust-toolchain@stable
|
||||
|
||||
- name: Build official plugins (release)
|
||||
run: cargo build --release -p marqdo_plugin_web -p marqdo_plugin_agent -p marqdo_plugin_quantum -p marqdo_plugin_linalg
|
||||
- name: Install Go (web plugin)
|
||||
uses: actions/setup-go@v5
|
||||
with:
|
||||
go-version: "1.23.x"
|
||||
|
||||
- name: Package native zip
|
||||
- name: Install zip + cgo toolchain
|
||||
run: sudo apt-get update && sudo apt-get install -y zip gcc libc6-dev
|
||||
|
||||
- name: Build Linux CLI + official plugins
|
||||
run: |
|
||||
set -euo pipefail
|
||||
cargo build --release
|
||||
cargo build --release -p marqdo_plugin_agent -p marqdo_plugin_quantum -p marqdo_plugin_linalg
|
||||
bash ./scripts/build-web-plugin.sh
|
||||
|
||||
- name: Package Linux native zip + CLI bundle
|
||||
run: |
|
||||
set -euo pipefail
|
||||
VER="${GITHUB_REF_NAME#v}"
|
||||
TARGET="x86_64-unknown-linux-gnu"
|
||||
mkdir -p dist/stage-native/native
|
||||
cp target/release/libweb.so dist/stage-native/native/libweb.so
|
||||
cp target/release/libagent.so dist/stage-native/native/libagent.so
|
||||
cp target/release/libquantum.so dist/stage-native/native/libquantum.so
|
||||
cp target/release/liblinalg.so dist/stage-native/native/liblinalg.so
|
||||
for lib in libweb.so libagent.so libquantum.so liblinalg.so; do
|
||||
src="target/release/${lib}"
|
||||
if [[ ! -f "$src" && "$lib" == libweb.so ]]; then
|
||||
src="plugins/web/build/libweb.so"
|
||||
fi
|
||||
test -f "$src" || { echo "missing $src" >&2; exit 1; }
|
||||
cp "$src" "dist/stage-native/native/${lib}"
|
||||
done
|
||||
(cd dist/stage-native && zip -r "../marqdo-${VER}-native-${TARGET}.zip" .)
|
||||
echo "NATIVE=marqdo-${VER}-native-${TARGET}.zip" >> "$GITHUB_ENV"
|
||||
|
||||
- name: Upload Linux native plugins
|
||||
stage="dist/stage-linux"
|
||||
rm -rf "$stage"
|
||||
mkdir -p "$stage/ext/native" "$stage/lib"
|
||||
cp target/release/marqdo "$stage/marqdo"
|
||||
chmod +x "$stage/marqdo"
|
||||
cp -a lib/. "$stage/lib/"
|
||||
cp -a ext/. "$stage/ext/"
|
||||
cp dist/stage-native/native/*.so "$stage/ext/native/"
|
||||
linux_zip="marqdo-${VER}-${TARGET}.zip"
|
||||
(cd "$stage" && zip -r "../${linux_zip}" .)
|
||||
echo "LINUX_ZIP=${linux_zip}" >> "$GITHUB_ENV"
|
||||
|
||||
- name: Upload Linux packages
|
||||
uses: softprops/action-gh-release@v2
|
||||
with:
|
||||
files: dist/${{ env.NATIVE }}
|
||||
files: |
|
||||
dist/${{ env.NATIVE }}
|
||||
dist/${{ env.LINUX_ZIP }}
|
||||
fail_on_unmatched_files: true
|
||||
env:
|
||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
+13
-1
@@ -24,7 +24,8 @@
|
||||
.marqdo/
|
||||
**/.marqdo/
|
||||
.marqdo-ext/
|
||||
.env
|
||||
/vendor/
|
||||
/.cargo/config.toml
|
||||
|
||||
# Generated HTML beside tracked public/*.mq.md (sources stay in git)
|
||||
/public/index.html
|
||||
@@ -60,6 +61,7 @@ plugins/*/tmp/
|
||||
/examples/web-net-site/data/
|
||||
/examples/web-net-site-zh/data/
|
||||
/examples/marqdo-blog/data/
|
||||
/examples/anlian-mq/data/
|
||||
|
||||
# Quantum draw/SVG runtime outputs (sources & gold .mq.md stay tracked)
|
||||
/tests/ext/quantum-*.svg
|
||||
@@ -72,3 +74,13 @@ plugins/*/tmp/
|
||||
|
||||
# Local ABI plugin copies (use `marqdo ext add quantum` / cargo build)
|
||||
/ext/native/
|
||||
|
||||
# Go web plugin c-shared build output (./scripts/build-web-plugin.sh)
|
||||
/plugins/web/build/
|
||||
|
||||
# PPA build: bundled Rust toolchain (packed into .orig by ppa-build-source.sh only)
|
||||
/third_party/rust/
|
||||
/third_party/
|
||||
|
||||
# ephemeral sqlite / test artifacts
|
||||
tests/ext/:memory:
|
||||
+216
@@ -8,6 +8,222 @@
|
||||
|
||||
### Changed
|
||||
|
||||
## Ext pack v1.0.6 — 2026-09-18
|
||||
|
||||
### Highlights
|
||||
|
||||
**ext/web OIDC、表单删除与安静管理台(CLI 仍为 v1.0.3)**:OIDC 登录/登出回首页、表单 `删除` 动作、默认关闭内置 admin/RBAC desk、独立 Redis 会话 URL、Postgres CRUD。安装:
|
||||
|
||||
```bash
|
||||
marqdo ext add web # CDN latest → 1.0.6
|
||||
```
|
||||
|
||||
### Added
|
||||
- **OIDC**:`auth.oidc` / 网页鉴权 OIDC;登录入口与 `next` 回跳。
|
||||
- **表单删除**:`form` 动作 `删除`/`delete`(通用 CRUD,无站点特判)。
|
||||
- **列表/路由**:请求上下文、列表装配延续;注销默认回 `/` 避免 IdP 再登录环。
|
||||
|
||||
### Fixed
|
||||
- 内置 admin / RBAC desk 默认安静,直至显式 `admin` / `enable_rbac`。
|
||||
- 静态资源缓存与 WASM 启动延迟;会话 CSRF 与 Postgres 方言。
|
||||
|
||||
### Changed
|
||||
- 扩展包 SemVer **1.0.6**(`ext/VERSION`);与 CLI **v1.0.3** 可独立安装。
|
||||
|
||||
## Ext pack v1.0.5 — 2026-09-18
|
||||
|
||||
### Highlights
|
||||
|
||||
**ext/web 请求上下文与表单来源(CLI 仍为 v1.0.3)**:字段 `来源`/`source`(session / route / now)、server-only 盖戳、页面 `列表装配`/`compose_list`;禁止按业务表特判。安装:
|
||||
|
||||
```bash
|
||||
marqdo ext add web # CDN latest → 1.0.5
|
||||
```
|
||||
|
||||
### Added
|
||||
- **Request context**:表单提交携带 `_mq_params` / `_mq_return`;`ApplySources` 从 session/route/now 写入。
|
||||
- **字段来源列**:`client`(默认)/ `session.username` / `route.NAME` / `now`;非 client 不渲染且覆盖客户端伪造。
|
||||
- **列表装配**:`compose_list` / `列表装配`(副绑定 + 条件/排序/插槽),详情页可同页渲染子列表。
|
||||
- 设计文:[ext-web-request-context.md](doc/design/ext-web-request-context.md);金样 `ext_web_form_source_live`。
|
||||
|
||||
### Changed
|
||||
- 扩展包 SemVer **1.0.5**(`ext/VERSION`);与 CLI **v1.0.3** 可独立安装。
|
||||
- 移除评论表名特判(`enrichCommentSubmit`)。
|
||||
|
||||
## Ext pack v1.0.4 — 2026-09-17
|
||||
|
||||
### Highlights
|
||||
|
||||
**ext/web 能力面扩展(CLI 仍为 v1.0.3)**:可配置 RBAC、租户作用域、WS `on_message`/presence、原生 SPA 内存路由、协同记事本 MVP。安装:
|
||||
|
||||
```bash
|
||||
marqdo ext add web # CDN latest → 1.0.4
|
||||
```
|
||||
|
||||
### Added
|
||||
- **RBAC**:五表(`web_permissions` / `web_roles` / `web_role_permissions` / `web_users` / `web_user_roles`);`app.enable_rbac`、`app.gate permissions=`、`rbac.can`、注册页、`/_rbac/*` 管理 API/desk。
|
||||
- **Tenant**:`app.tenant`(path/header/subdomain)+ `tenant_scope` 自动过滤/盖戳。
|
||||
- **WebSocket G-WS2**:`route_ws` 支持 `on_message` 钩子、动态 room、`presence` 通道。
|
||||
- **Native SPA**:内存 `store_set` / `spa_goto` 与全页 WASM SPA 样站。
|
||||
- **Collab MVP**:LWW 文档协议(`DOC\t`)双端协同记事本样站。
|
||||
|
||||
### Changed
|
||||
- 扩展包 SemVer **1.0.4**(`ext/VERSION`);与 CLI **v1.0.3** 可独立安装。
|
||||
|
||||
## v1.0.3 — 2026-09-17
|
||||
|
||||
### Highlights
|
||||
|
||||
**分发渠道齐备**:Ubuntu PPA 装 CLI;扩展包走 CDN(`ext.marqdo.com`)与 GitHub;CLI 与扩展可分开发版。本版 CLI 与扩展包 **同步为 1.0.3**。
|
||||
|
||||
**语法**:未绑定的 GFM 表格是可丢弃的集合值,不再报 `unrecognized statement`(文档页可直接写安装表)。
|
||||
|
||||
```bash
|
||||
# Ubuntu
|
||||
sudo add-apt-repository ppa:cflmy/marqdo
|
||||
sudo apt update && sudo apt install marqdo
|
||||
marqdo ext add web
|
||||
|
||||
# 或源码 / Releases
|
||||
git checkout v1.0.3 && cargo build --release
|
||||
```
|
||||
|
||||
### Added
|
||||
- Ubuntu PPA packaging: `debian/` + `scripts/ppa-ship.sh` (一键装工具/打包/dput) + `ppa-build-source.sh` + [ubuntu-ppa.md](doc/design/ubuntu-ppa.md).
|
||||
- **Extension CDN** (`https://ext.marqdo.com` / Cloudflare R2):`ext add` 下载顺序改为 CDN → GitHub → proxy;独立包版本见 `ext/VERSION` 与 CDN `latest/VERSION`;上传脚本 `scripts/upload-ext-r2.py`(凭据 `~/.marqdo/r2.env`)。设计见 [ext-cdn.md](doc/design/ext-cdn.md)。
|
||||
- `ext add` 下载:GitHub 失败后自动回退 `https://proxy.cflmy.top/github.com/…`;可用 `MARQDO_EXT_DOWNLOAD_BASE` 指定首选镜像;加长读写超时。
|
||||
- 用户文档(README / `public/00-欢迎` / `features/05-扩展`)标明安装渠道:Ubuntu PPA、GitHub Releases、源码;扩展走 CDN。
|
||||
|
||||
### Fixed
|
||||
- `ext/` 导入默认搜索 `~/.marqdo/ext`(与 `marqdo ext add` 安装根一致),无需再手动 `export MARQDO_EXT`。
|
||||
- PPA/noble:捆绑 `third_party/rust`(现代 cargo)以构建 Cargo.lock v4;修复首次 Launchpad 构建失败(distro cargo 1.75)。
|
||||
- 未绑定的 GFM 表格不再报 `unrecognized statement`:作为集合值求值后丢弃(文档中可写表)。
|
||||
|
||||
### Changed
|
||||
- 允许 **CLI 与扩展包分开发版**:扩展包 SemVer 可与 `Cargo.toml` 不同(`MARQDO_EXT_VERSION` / `ext/VERSION` / CDN latest)。
|
||||
- 发版 skill:支持 `full` / `cli` / `ext`;扩展必传 R2+GitHub;CLI 走 PPA;需用户操作时打印确切命令。
|
||||
|
||||
## v1.0.2 — 2026-09-16
|
||||
|
||||
### Highlights
|
||||
|
||||
**表驱动页面引言(`compose_intro` / `引言装配`)**:英雄区用 GFM「属性 / 值 / 样式」表声明,不再手写 HTML 字符串;WWW Demo 样站与后台门禁一并加固。
|
||||
|
||||
```bash
|
||||
git checkout v1.0.2
|
||||
cargo build --release
|
||||
bash ./scripts/build-web-plugin.sh
|
||||
# 或:解压 Release 的 marqdo-1.0.2-*-native-*.zip / Linux CLI zip
|
||||
marqdo run examples/web-site-zh/index.mq.md
|
||||
```
|
||||
|
||||
### Added
|
||||
- Go `libweb`:`web_compose_intro` — 将引言表装配为 `.main-intro` HTML;中英 API `页面.引言装配` / `page.compose_intro`(`ext/web`)。
|
||||
- 验收样例:`tests/ext/web-intro-compose.mq.md`;`examples/web-site` / `web-site-zh` 升级为表驱动引言 + 文学风壳层 + 卡片→详情路由。
|
||||
|
||||
### Fixed
|
||||
- 后台样站:导航/侧栏/页脚槽位与门禁登录挂载对齐;表单字段加宽便于创建。
|
||||
|
||||
### Changed
|
||||
- Demo 叙述与种子数据面向 WWW Industry / 可复现演示;作者仍零业务 JS、零手写 `.css`。
|
||||
|
||||
## v1.0.1 — 2026-09-15
|
||||
|
||||
### Highlights
|
||||
|
||||
**ext/web(Go libweb)回归修复**:动态路由查询条件恢复 `{param}` 代入;详情 SSR + Markdown;样式表数字不再误报。
|
||||
|
||||
```bash
|
||||
git checkout v1.0.1
|
||||
cargo build --release
|
||||
bash ./scripts/build-web-plugin.sh
|
||||
# 或:解压 Release 的 marqdo-1.0.1-*-native-*.zip / Linux CLI zip
|
||||
marqdo run examples/marqdo-blog/index.mq.md
|
||||
```
|
||||
|
||||
### Added
|
||||
- Go web plugin:详情页正文 Markdown(goldmark GFM),对齐 Rust `pulldown-cmark` 路径。
|
||||
|
||||
### Fixed
|
||||
- **动态路由 `{param}` 未代入查询条件**(`ext/web` Go):`selectPageData` 递归展开 `query` 全部字符串叶子;`data-slot-src` / `_route` 同步替换。`examples/marqdo-blog` `/post/{slug}` 详情 SSR 恢复。
|
||||
- **样式表数字单元格误报「可疑 `/` 除法」**:`cssValueSuspicious` 不再把合法 `z-index`/`opacity` 等 number 当警告。
|
||||
- Go 1.22+ ServeMux:`/static/` 与 `/static/favicon.svg` 的 GET/HEAD 注册冲突导致博客启动 panic。
|
||||
- Rust archive 同步:`resolve_placeholders` 递归 + CSS number 误报收窄(非默认构建路径)。
|
||||
|
||||
## v1.0.0 — 2026-09-14
|
||||
|
||||
### Highlights
|
||||
|
||||
**Markdown 语法映射 v0.3 成为 1.0 宪法**:`**粗体**` = 代码,`*斜体*` = 返回,叙述里的 `` `名` `` 声明并推断形参。这是相对 v0.4 / 旧 `*语句*`/`**返回**` 的破坏性对调。Linux 预编译拓展包与 CLI bundle 为 Release 必出资产。
|
||||
|
||||
```bash
|
||||
git checkout v1.0.0
|
||||
cargo build --release
|
||||
# Linux:也可直接解压 Release 的 marqdo-1.0.0-x86_64-unknown-linux-gnu.zip
|
||||
marqdo run tests/markup-v03/inc-prose.mq.md
|
||||
```
|
||||
|
||||
### Added
|
||||
- **Markup v0.3 运行时闭环**:粗体=`代码`、斜体=`返回`、叙述 `` `名` `` 声明与形参推断为唯一映射;金样 `tests/markup-v03/`。
|
||||
- **方括号标记调用**与前置修饰语:`礼貌 [问候] x`;取元主语法 `[键](集合)`(脚注取元过渡保留)。
|
||||
- **代码即文档叙述面 G1–G4**:模块级 `---` 跳过、装饰性强调、浮点面量、动态键。
|
||||
- **粗体表达式语句** `**n + 1**`;`--dump-lines` 标注 `[decl]/[bold]/[italic]`;`--dump-ast` 显示 inferred 形参与死绑定。
|
||||
- **Release Linux 包必出**:`linux` job 上传 `*-native-x86_64-unknown-linux-gnu.zip` 与 Linux CLI bundle。
|
||||
|
||||
### Fixed
|
||||
- 行首 `` `名`… `` 叙述不再当语句(修复 pages CI:`public/features/16-fs-mid2.mq.md`)。
|
||||
- 句中斜体强调(`*very important*` / `*foo.bar*`)不再误收束函数;Decl 名须为标识符;残缺粗体保持 GAP 恢复。
|
||||
- 胶合 `` `名`=default …prose `` 为 Decl 而非赋值。
|
||||
|
||||
### Changed
|
||||
- 教程 / Skill / `lib` / `ext` / `public` 对齐 v0.3 标记;view 推断形参 `chip inferred`。
|
||||
|
||||
## v0.4.0 — 2026-09-13
|
||||
|
||||
### Highlights
|
||||
|
||||
**Go `libweb` 默认落地(W-G0–W-G14)**:官方网页原生插件改为 Go C ABI;CLI / gold / Release 走 `scripts/build-web-plugin.sh`;Rust 源码归档。另附 **anlian-mq** 验收站与表单插槽 / `MARQDO_EXT` 提示修复。
|
||||
|
||||
```bash
|
||||
git checkout v0.4.0
|
||||
# 构建 web 原生插件(需 Go + cgo):
|
||||
bash ./scripts/build-web-plugin.sh
|
||||
marqdo ext add web
|
||||
marqdo run examples/anlian-mq/index.mq.md
|
||||
```
|
||||
|
||||
### Added
|
||||
- **`plugins/web` Go 全量重写(W-G0–W-G13)**:C ABI 对等装配/DB/表单/listen/鉴权/上传/SEO/WS/驱动/proxy·invoke/定制壳;`scripts/build-web-plugin.sh` → `libweb.so` / `web.dll`;ADR [0004](doc/adr/0004-web-plugin-go.md) · 施工 [ext-web-go-rewrite.md](doc/design/ext-web-go-rewrite.md)。
|
||||
- **W-G14 验收**:`examples/anlian-mq/`(暗恋见君风格论坛:路由/登录/粉玻璃主题/片段 API;SQLite 本地可跑)。
|
||||
- **GAP-11**:`compose_form` / `表单装配` 支持 `target` / `表单插槽`(如 `#id`),把表单注入引言 HTML 内的挂载点。
|
||||
|
||||
### Fixed
|
||||
- **GAP-12**:`ext/…` import 解析失败且未设置 `MARQDO_EXT` 时,错误附带 `hint: set MARQDO_EXT to the directory that contains web/`。
|
||||
- **listen 会话 / CSRF**:登录后 `IssueCookie` 不再误设 `Max-Age=0`;页面 ABIs(`query`/`order`/`link_prefix`/`css`/`detail`)与 `web_page_chrome`、`invoke return=html` 对齐 anlian 需求。
|
||||
|
||||
### Changed
|
||||
- **默认 `libweb` 为 Go**:Release / gold / `ext add web` 不再构建 Rust `marqdo_plugin_web`;旧 Rust 树移至 `plugins/web-rust-archive/`(非 workspace 成员)。作者面 `ext/web` ABI 名保持兼容。
|
||||
|
||||
## v0.3.9 — 2026-09-09
|
||||
|
||||
### Highlights
|
||||
|
||||
**业务联调缺口 GAP-06–10**:解析器不再吞掉嵌套反引号/`text=[…]` 后的函数体;`invoke` 的 `Null` 不再伪装成功;`sys.exec capture=` 可取 stdout;流式 proxy 反缓冲头。
|
||||
|
||||
```bash
|
||||
git checkout v0.3.9
|
||||
```
|
||||
|
||||
### Added
|
||||
- **`sys.exec` / `系统.执行`**:可选 `capture=` / `捕获=`;为真时返回 `{code, stdout, stderr}`(GAP-09)。
|
||||
|
||||
### Fixed
|
||||
- **GAP-06/07**:`*…*` 分类对反引号/字符串内的 `*` 不再误判;错误收尾的赋值行不再吞掉后续 `##` 体(`>` / 合法 `*…*` 可脱出注释段);命名参数边界尊重 `[…]`/`{…}`。
|
||||
- **GAP-08**:`app.invoke` 对 `Null`/`None` 返回不再伪装成 `{"ok":true}`,改为 500 + `{"ok":false,"error":"null result"}`。
|
||||
- **GAP-10**:`app.proxy` `stream=true` 响应补齐 `Cache-Control: no-cache, no-transform` 与 `X-Accel-Buffering: no`。
|
||||
|
||||
### Changed
|
||||
|
||||
## v0.3.8 — 2026-09-09
|
||||
|
||||
### Highlights
|
||||
|
||||
Generated
+31
-1386
File diff suppressed because it is too large.
Load diff
+5
-3
@@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "marqdo"
|
||||
version = "0.3.8"
|
||||
version = "1.0.3"
|
||||
edition = "2021"
|
||||
license = "Apache-2.0"
|
||||
description = "Marqdo — Markdown markers as an interpreted programming language"
|
||||
@@ -50,18 +50,20 @@ include_dir = "0.7"
|
||||
libc = { version = "0.2", optional = true }
|
||||
|
||||
[target.'cfg(target_arch = "wasm32")'.dependencies]
|
||||
# No `wasmbind`: keeps cdylib free of wasm-bindgen imports (raw mq_* ABI).
|
||||
# Custom entropy — no `js`/wasm-bindgen imports (raw mq_* ABI + marqdo-bridge.js).
|
||||
chrono = { version = "0.4", default-features = false, features = ["alloc", "std"] }
|
||||
getrandom = { version = "=0.2.17", default-features = false, features = ["custom"] }
|
||||
|
||||
[workspace]
|
||||
members = [
|
||||
"plugins/demo",
|
||||
"plugins/agent",
|
||||
"plugins/web",
|
||||
"plugins/quantum",
|
||||
"plugins/linalg",
|
||||
"crates/marqdo-wasm",
|
||||
]
|
||||
# Official web plugin is Go (`plugins/web/`); Rust sources kept as
|
||||
# `plugins/web-rust-archive/` for reference (not a workspace member).
|
||||
resolver = "2"
|
||||
|
||||
[dev-dependencies]
|
||||
|
||||
@@ -23,23 +23,23 @@ Marqdo 把 Markdown **标记当作编程语法**:同一个 `.mq.md` 文件,
|
||||
|
||||
---
|
||||
|
||||
## 语法速览(v0.2)
|
||||
## 语法速览(v0.3)
|
||||
|
||||
| 标记 | 含义 |
|
||||
|------|------|
|
||||
| 无标记行 | 注释(空行分段) |
|
||||
| `*…*` | 程序语句 |
|
||||
| `**…**` | **返回值**(架构) |
|
||||
| `****` / `**` + 空白 + `**` | **空返回**(`None`),并结束本函数体 |
|
||||
| 无标记行 | 叙述(注释);行内 `` `名` `` 可声明 |
|
||||
| `**…**` | **代码**(赋值 / 调用 / 表达式) |
|
||||
| `*…*` | **返回值**(整行、`返回*n*`、或表达式形) |
|
||||
| `****` / 整行 `**` / `*None*` | **空返回**(`None`),并结束本函数体 |
|
||||
| `> print …` 等 | 输出等副作用 = **普通函数**,非架构标记 |
|
||||
| `#` | 对象 / 类型(构造体;`# main` = 入口) |
|
||||
| `##` … | 函数 / 方法(按标题深度嵌套) |
|
||||
| `` > `obj`.method … `` | 方法调用(`obj` 为带 `_type` 的 map) |
|
||||
| `+` / `1.` … | 函数头下 `` + `名` `` = 形参;体内 `1.` `2.` … = 分支(`N. *` = else) |
|
||||
| `-` | 循环(`` - `条件` `` 或 `` - [项](集合) `` / `` - [`项`](`集合`) ``) |
|
||||
| 表格 | 集合 |
|
||||
| 函数体内单独一行 `---` / `***` | **结束本函数体**(无返回值收束;见 mapping §11) |
|
||||
| 文件开头成对 `---` … `---` | Frontmatter(元信息 / 导入),与函数结束符消歧 |
|
||||
| 叙述 `` `名` `` / `` `名`=默认 `` | 形参由体推断(`` + `名` `` 仍可用) |
|
||||
| `1.` … | 体内 `1.` `2.` … = 分支(`N. *` = else) |
|
||||
| `-` | 循环(`` - `条件` `` 或 `` - [项](集合) ``) |
|
||||
| 表格 | 集合;取元优先 `[键](集合)` |
|
||||
| 单独一行 `---` / `***` | **叙述分隔**(跳过;不是函数收束) |
|
||||
|
||||
```markdown
|
||||
# main
|
||||
@@ -47,19 +47,18 @@ Marqdo 把 Markdown **标记当作编程语法**:同一个 `.mq.md` 文件,
|
||||
> 问候 谁=World
|
||||
|
||||
## 问候
|
||||
+ `谁`
|
||||
|
||||
> print text=Hello `谁`!
|
||||
向`谁`问好。
|
||||
|
||||
---
|
||||
**print text="Hello " + 谁**
|
||||
*None*
|
||||
|
||||
## 加一
|
||||
+ `n`
|
||||
|
||||
**`n` + 1**
|
||||
对于输入变量`n`,执行**n=n+1**接着返回*n*。
|
||||
```
|
||||
|
||||
完整约定:[markdown-mapping.md](doc/design/markdown-mapping.md)。
|
||||
完整约定:[markdown-mapping-v0.3.md](doc/design/markdown-mapping-v0.3.md)。
|
||||
|
||||
---
|
||||
|
||||
@@ -99,9 +98,9 @@ marqdo catalog public -o .marqdo
|
||||
|
||||
---
|
||||
|
||||
## 现状(v0.3.8)
|
||||
## 现状(v1.0.3)
|
||||
|
||||
- 映射与解释器:Phase I 树遍历 + 字节码后端可用;金样例在 `tests/`
|
||||
- 映射与解释器:**v0.3 语法宪法**(`**` 代码 / `*` 返回 / 叙述声明);Phase I 树遍历 + 字节码后端;金样例在 `tests/` 与 `tests/markup-v03/`
|
||||
- **对象**:`#` = 类型/构造,`##`+ = 函数/方法;见 [objects.md](doc/design/objects.md)
|
||||
- **`marqdo view`**:文档浏览器(Structure + 函数大纲/搜索 + Execution + Variables 浮窗)
|
||||
- **`marqdo debug`**:独立调试页(断点 / 单步 / locals;默认端口 7430;页面 favicon / 品牌使用官方 Logo)
|
||||
@@ -109,24 +108,34 @@ 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));示例 [marqdo-blog](examples/marqdo-blog/);生产路径见 [web-asgi-servers-and-marqdo.md](doc/design/web-asgi-servers-and-marqdo.md)
|
||||
- **`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)
|
||||
- **`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 stdio**(`mcp_server`);宿主缺口见 [ext-hosting.md](doc/roadmap/ext-hosting.md) · [agent-framework-gaps-after-a4.md](doc/research/agent-framework-gaps-after-a4.md)
|
||||
- **`llm`**:OpenAI 兼容对话
|
||||
- 安装:`marqdo ext list` / `add …` / `remove`([ext-cli.md](doc/design/ext-cli.md);默认 `~/.marqdo/ext`)。原生插件先 `cargo build -p marqdo_plugin_*` 再 `ext add`
|
||||
- **原生插件 ABI**:[`include/marqdo_abi.h`](include/marqdo_abi.h) · [ext-abi.md](doc/design/ext-abi.md);`plugins/{demo,agent,web,quantum,linalg}`
|
||||
- **原生插件 ABI**:[`include/marqdo_abi.h`](include/marqdo_abi.h) · [ext-abi.md](doc/design/ext-abi.md);`plugins/{demo,agent,web,quantum,linalg}`(`web` 为 Go;其余为 Rust)
|
||||
- **用户静态站**:`public/` → `view output` → CI 发布 [gh-pages](https://cflmy.github.io/marqdo/)
|
||||
- **VS Code 扩展**:分支 **`vscode-extension`**(`main` 不跟踪源码;见 [vscode-extension-commit.md](doc/design/vscode-extension-commit.md));Release 附带 `.vsix`
|
||||
- **浏览器 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(v0.3.8)
|
||||
### 如何使用最新 Marqdo(v1.0.3)
|
||||
|
||||
**安装解释器(任选其一)**
|
||||
|
||||
| 方式 | 适用 | 命令 / 链接 |
|
||||
|------|------|-------------|
|
||||
| **Ubuntu PPA** | Ubuntu 24.04+(`noble` 等) | `sudo add-apt-repository ppa:cflmy/marqdo && sudo apt update && sudo apt install marqdo` |
|
||||
| **GitHub Releases** | Windows / Linux 预编译 zip | https://github.com/cflmy/marqdo/releases |
|
||||
| **源码** | 需本机 Rust | 见下方 `git clone` + `cargo build --release` |
|
||||
|
||||
**安装官方扩展**(与 CLI 可分开发版):`marqdo ext add …` 默认下载顺序为 **CDN** [`https://ext.marqdo.com`](https://ext.marqdo.com) → GitHub Releases → [`proxy.cflmy.top`](https://proxy.cflmy.top) 镜像。
|
||||
|
||||
```bash
|
||||
# 1) 源码安装(跟 tag 或 main)
|
||||
git clone https://github.com/cflmy/marqdo.git && cd marqdo
|
||||
git checkout v0.3.8 # 或留在 main
|
||||
git checkout v1.0.3 # 或留在 main
|
||||
cargo build --release
|
||||
export PATH="$PWD/target/release:$PATH"
|
||||
marqdo version
|
||||
@@ -139,25 +148,28 @@ marqdo view public --no-open
|
||||
marqdo debug public --no-open
|
||||
marqdo catalog public -o .marqdo
|
||||
|
||||
# 3) 安装官方扩展(Release 用户:无需本机 Rust)
|
||||
marqdo ext add web # 或:网页 — 自动下载 L1 + 预编译 native
|
||||
# 3) 安装官方扩展(Release / CDN 用户:无需本机 Rust/Go)
|
||||
marqdo ext add web # 或:网页 — 自动下载 L1 + 预编译 native(Go libweb)
|
||||
marqdo ext add agent # 或:智能体
|
||||
marqdo ext add quantum # 或:量子
|
||||
marqdo ext add linalg # 或:线性代数
|
||||
marqdo ext add llm # 或:大模型(纯 .mq.md)
|
||||
# 开发者也可:cargo build --release -p marqdo_plugin_* 后在本机 target/ 安装
|
||||
# 开发者:cargo build --release -p marqdo_plugin_{agent,quantum,linalg}
|
||||
# bash ./scripts/build-web-plugin.sh # 需 Go + cgo → libweb
|
||||
# 离线:解压 Windows zip(已含 ext/native)或手动放下 native zip;MARQDO_EXT_NO_DOWNLOAD=1
|
||||
|
||||
# 4) 动态站示例(扩展装好后)
|
||||
marqdo run examples/web-site-zh/index.mq.md # 表驱动引言 Demo
|
||||
marqdo run examples/marqdo-blog/index.mq.md
|
||||
marqdo run examples/anlian-mq/index.mq.md # W-G14 验收站
|
||||
# 浏览器打开终端打印的 listen 地址;/favicon.ico 与 logo 装配见 W8
|
||||
|
||||
# 5) 浏览器 WASM(可选)
|
||||
marqdo wasm build
|
||||
# → dist/wasm/ … 见 examples/browser-hello/
|
||||
|
||||
# 6) Windows:也可从 GitHub Releases 下载 exe / zip / vsix
|
||||
# https://github.com/cflmy/marqdo/releases/tag/v0.3.8
|
||||
# 6) Releases:Windows exe/zip/vsix;Linux CLI zip + native `.so` zip
|
||||
# https://github.com/cflmy/marqdo/releases/tag/v1.0.3
|
||||
```
|
||||
|
||||
开发期也可用 `cargo run -- …` 代替已安装的 `marqdo`:
|
||||
@@ -169,7 +181,7 @@ cargo run -- view output public -o public
|
||||
powershell -File ./scripts/build-public.ps1
|
||||
```
|
||||
|
||||
**发布包(GitHub Releases)**:单独二进制 **已内置**官方 `lib/`(`import …:lib/…` 可直接导入)。仍提供带 `lib/` 的 zip 便于覆盖或离线分发。**扩展库**用 `marqdo ext add …` 安装(见 [CHANGELOG](CHANGELOG.md) 与 [ext-cli.md](doc/design/ext-cli.md));原生 `.so`/`.dll` 需本地编译或从带 `native/` 的安装目录解析。
|
||||
**发布包**:GitHub Releases 的单独二进制 **已内置**官方 `lib/`。Ubuntu 用户优先 **PPA** 装 CLI。**扩展库**用 `marqdo ext add …`(CDN → GitHub);设计见 [ext-cdn.md](doc/design/ext-cdn.md) · [ubuntu-ppa.md](doc/design/ubuntu-ppa.md) · [ext-cli.md](doc/design/ext-cli.md)。
|
||||
|
||||
文档:用户站 [public/](public/) · 设计 [doc/](doc/) · OKF / catalog [catalog-cli.md](doc/design/catalog-cli.md) · 调试 [view-debug.md](doc/design/view-debug.md) · 变更 [CHANGELOG.md](CHANGELOG.md)
|
||||
---
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "marqdo-wasm"
|
||||
version = "0.3.8"
|
||||
version = "1.0.3"
|
||||
edition = "2021"
|
||||
license = "Apache-2.0"
|
||||
description = "Marqdo interpreter as WebAssembly (browser host bridge)"
|
||||
|
||||
@@ -197,6 +197,20 @@ export function eventArgsFromDom(ev, valueFromSel) {
|
||||
args.fields = fields;
|
||||
}
|
||||
}
|
||||
if (ev && (ev.type === "scroll" || ev.type === "resize")) {
|
||||
try {
|
||||
const doc = typeof document !== "undefined" ? document.documentElement : null;
|
||||
const body = typeof document !== "undefined" ? document.body : null;
|
||||
const scrollTop = (doc && (doc.scrollTop || 0)) || (body && body.scrollTop) || 0;
|
||||
const height = doc ? (doc.scrollHeight - doc.clientHeight) || 1 : 1;
|
||||
const ratio = Math.max(0, Math.min(1, scrollTop / height));
|
||||
args.scroll_top = scrollTop;
|
||||
args.scroll_max = height;
|
||||
args.scroll_ratio = ratio;
|
||||
} catch (_) {
|
||||
/* ignore */
|
||||
}
|
||||
}
|
||||
return args;
|
||||
}
|
||||
|
||||
@@ -721,75 +735,88 @@ function runObserveEffect(exports, spec, onError) {
|
||||
const kind = String(spec.kind || spec.type || "intersect").toLowerCase();
|
||||
const sel = String(spec.sel || "");
|
||||
const thenFn = spec.then;
|
||||
const id = String(spec.id || `obs${++observeSeq}`);
|
||||
const el = qsOne(sel);
|
||||
if (!el || !thenFn) return;
|
||||
const baseId = String(spec.id || `obs${++observeSeq}`);
|
||||
const nodes = qsAll(sel);
|
||||
if (!nodes.length || (!thenFn && !spec.add_class)) return;
|
||||
|
||||
const prev = observeHandles.get(id);
|
||||
if (prev) {
|
||||
try {
|
||||
prev.disconnect();
|
||||
} catch (_) {
|
||||
/* ignore */
|
||||
}
|
||||
}
|
||||
|
||||
const fire = (payload) => {
|
||||
try {
|
||||
const result = call(exports, thenFn, payload);
|
||||
if (!result.ok) {
|
||||
if (onError) onError(result.error);
|
||||
return;
|
||||
nodes.forEach((el, idx) => {
|
||||
const id = nodes.length === 1 ? baseId : `${baseId}_${idx}`;
|
||||
const prev = observeHandles.get(id);
|
||||
if (prev) {
|
||||
try {
|
||||
prev.disconnect();
|
||||
} catch (_) {
|
||||
/* ignore */
|
||||
}
|
||||
applyEffects(exports, result.value, { onError });
|
||||
} catch (e) {
|
||||
if (onError) onError(String(e));
|
||||
}
|
||||
};
|
||||
|
||||
if (kind === "resize" && typeof ResizeObserver !== "undefined") {
|
||||
const ro = new ResizeObserver((entries) => {
|
||||
const en = entries[0];
|
||||
const cr = en?.contentRect;
|
||||
fire({
|
||||
ok: true,
|
||||
kind: "resize",
|
||||
id,
|
||||
width: cr ? cr.width : 0,
|
||||
height: cr ? cr.height : 0,
|
||||
});
|
||||
});
|
||||
ro.observe(el);
|
||||
observeHandles.set(id, ro);
|
||||
return;
|
||||
}
|
||||
const fire = (payload) => {
|
||||
try {
|
||||
const result = call(exports, thenFn, payload);
|
||||
if (!result.ok) {
|
||||
if (onError) onError(result.error);
|
||||
return;
|
||||
}
|
||||
applyEffects(exports, result.value, { onError });
|
||||
} catch (e) {
|
||||
if (onError) onError(String(e));
|
||||
}
|
||||
};
|
||||
|
||||
if (typeof IntersectionObserver !== "undefined") {
|
||||
const io = new IntersectionObserver(
|
||||
(entries) => {
|
||||
if (kind === "resize" && typeof ResizeObserver !== "undefined") {
|
||||
const ro = new ResizeObserver((entries) => {
|
||||
const en = entries[0];
|
||||
if (!en) return;
|
||||
const cr = en?.contentRect;
|
||||
fire({
|
||||
ok: true,
|
||||
kind: "intersect",
|
||||
kind: "resize",
|
||||
id,
|
||||
intersecting: !!en.isIntersecting,
|
||||
ratio: en.intersectionRatio,
|
||||
width: cr ? cr.width : 0,
|
||||
height: cr ? cr.height : 0,
|
||||
});
|
||||
if (spec.once && en.isIntersecting) {
|
||||
try {
|
||||
io.disconnect();
|
||||
} catch (_) {
|
||||
/* ignore */
|
||||
});
|
||||
ro.observe(el);
|
||||
observeHandles.set(id, ro);
|
||||
return;
|
||||
}
|
||||
|
||||
if (typeof IntersectionObserver !== "undefined") {
|
||||
const opts = { threshold: spec.threshold != null ? Number(spec.threshold) : 0.1 };
|
||||
if (spec.rootMargin != null) opts.rootMargin = String(spec.rootMargin);
|
||||
const io = new IntersectionObserver(
|
||||
(entries) => {
|
||||
const en = entries[0];
|
||||
if (!en) return;
|
||||
if (en.isIntersecting && spec.add_class) {
|
||||
for (const c of String(spec.add_class).split(/\s+/).filter(Boolean)) {
|
||||
el.classList.add(c);
|
||||
}
|
||||
}
|
||||
observeHandles.delete(id);
|
||||
}
|
||||
},
|
||||
{ threshold: spec.threshold != null ? Number(spec.threshold) : 0.1 },
|
||||
);
|
||||
io.observe(el);
|
||||
observeHandles.set(id, io);
|
||||
}
|
||||
if (thenFn) {
|
||||
fire({
|
||||
ok: true,
|
||||
kind: "intersect",
|
||||
id,
|
||||
intersecting: !!en.isIntersecting,
|
||||
ratio: en.intersectionRatio,
|
||||
target_id: el.id || "",
|
||||
});
|
||||
}
|
||||
if (spec.once && en.isIntersecting) {
|
||||
try {
|
||||
io.disconnect();
|
||||
} catch (_) {
|
||||
/* ignore */
|
||||
}
|
||||
observeHandles.delete(id);
|
||||
}
|
||||
},
|
||||
opts,
|
||||
);
|
||||
io.observe(el);
|
||||
observeHandles.set(id, io);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
function buildFetchInit(spec) {
|
||||
@@ -921,8 +948,23 @@ function runIntervalEffect(exports, spec, onError) {
|
||||
intervalHandles.set(id, handle);
|
||||
}
|
||||
|
||||
const memoryKV = new Map();
|
||||
|
||||
function storageStore(scope) {
|
||||
if (scope === "cookie") return null;
|
||||
if (scope === "memory" || scope === "mem" || scope === "内存") {
|
||||
return {
|
||||
getItem(key) {
|
||||
return memoryKV.has(key) ? memoryKV.get(key) : null;
|
||||
},
|
||||
setItem(key, value) {
|
||||
memoryKV.set(key, String(value));
|
||||
},
|
||||
removeItem(key) {
|
||||
memoryKV.delete(key);
|
||||
},
|
||||
};
|
||||
}
|
||||
if (typeof localStorage === "undefined") return null;
|
||||
return scope === "session" ? sessionStorage : localStorage;
|
||||
}
|
||||
@@ -1371,12 +1413,24 @@ export async function autoMount(doc) {
|
||||
|
||||
const g = typeof globalThis !== "undefined" ? globalThis : undefined;
|
||||
if (g && g.document) {
|
||||
// Defer WASM boot until after first paint / load so LCP images are not
|
||||
// contending with a ~1.6MB wasm download on the critical path.
|
||||
const start = () => {
|
||||
autoMount(g.document).catch((e) => console.error("marqdo autoMount:", e));
|
||||
const run = () => {
|
||||
autoMount(g.document).catch((e) => console.error("marqdo autoMount:", e));
|
||||
};
|
||||
const schedule = () => {
|
||||
if (typeof g.requestIdleCallback === "function") {
|
||||
g.requestIdleCallback(() => run(), { timeout: 1500 });
|
||||
} else {
|
||||
g.setTimeout(run, 0);
|
||||
}
|
||||
};
|
||||
if (g.document.readyState === "complete") {
|
||||
schedule();
|
||||
} else {
|
||||
g.addEventListener("load", schedule, { once: true });
|
||||
}
|
||||
};
|
||||
if (g.document.readyState === "loading") {
|
||||
g.document.addEventListener("DOMContentLoaded", start);
|
||||
} else {
|
||||
queueMicrotask(start);
|
||||
}
|
||||
start();
|
||||
}
|
||||
@@ -185,7 +185,38 @@ fn pack_json(v: &serde_json::Value) -> *mut u8 {
|
||||
ptr::copy_nonoverlapping(len.to_le_bytes().as_ptr(), out, 4);
|
||||
ptr::copy_nonoverlapping(bytes.as_ptr(), out.add(4), bytes.len());
|
||||
}
|
||||
out
|
||||
out
|
||||
}
|
||||
|
||||
/// getrandom `custom` backend for wasm32 — no wasm-bindgen / JS glue imports.
|
||||
/// Preferable to the `js` feature which pulls `__wbindgen_*` and breaks raw mq_* ABI.
|
||||
#[cfg(target_arch = "wasm32")]
|
||||
#[no_mangle]
|
||||
unsafe extern "Rust" fn __getrandom_custom(dest: *mut u8, len: usize) -> u32 {
|
||||
// xorshift64* seeded once; fine for uuid/non-crypto browser host helpers.
|
||||
use std::cell::Cell;
|
||||
thread_local! {
|
||||
static STATE: Cell<u64> = const { Cell::new(0x4d51_5241_4e44_4f21) };
|
||||
}
|
||||
if dest.is_null() || len == 0 {
|
||||
return 0;
|
||||
}
|
||||
let mut s = STATE.with(|c| {
|
||||
let mut v = c.get();
|
||||
if v == 0 {
|
||||
v = 0x4d51_5241_4e44_4f21;
|
||||
}
|
||||
v
|
||||
});
|
||||
let buf = unsafe { std::slice::from_raw_parts_mut(dest, len) };
|
||||
for b in buf.iter_mut() {
|
||||
s ^= s << 13;
|
||||
s ^= s >> 7;
|
||||
s ^= s << 17;
|
||||
*b = (s >> 8) as u8;
|
||||
}
|
||||
STATE.with(|c| c.set(s));
|
||||
0
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
|
||||
Vendored
+22
@@ -0,0 +1,22 @@
|
||||
Marqdo for Ubuntu (PPA)
|
||||
=======================
|
||||
|
||||
This package installs the marqdo CLI (/usr/bin/marqdo).
|
||||
|
||||
Official language extensions are not bundled. After install:
|
||||
|
||||
marqdo ext add web
|
||||
marqdo ext add quantum
|
||||
|
||||
Extension packs download from https://ext.marqdo.com (then GitHub / proxy).
|
||||
|
||||
Install this package from:
|
||||
|
||||
sudo add-apt-repository ppa:cflmy/marqdo
|
||||
sudo apt update
|
||||
sudo apt install marqdo
|
||||
|
||||
Also available: GitHub Releases (Windows/Linux zips) and building from source.
|
||||
|
||||
Documentation: https://github.com/cflmy/marqdo
|
||||
PPA notes: doc/design/ubuntu-ppa.md in the upstream repository.
|
||||
Vendored
+27
@@ -0,0 +1,27 @@
|
||||
marqdo (1.0.3-1ppa2) noble; urgency=medium
|
||||
|
||||
* Fix Launchpad build: dh_clean -Xvendor/ so cargo vendor checksums keep
|
||||
Cargo.toml.orig (debian-only; reuse published 1.0.3.orig.tar.xz).
|
||||
|
||||
-- cflmy <pingan@cflmy.cn> Thu, 17 Sep 2026 21:28:00 +0800
|
||||
|
||||
marqdo (1.0.3-1ppa1) noble; urgency=medium
|
||||
|
||||
* Marqdo 1.0.3: PPA + ext CDN; unbound GFM tables; bundled Rust for noble.
|
||||
|
||||
-- cflmy <pingan@cflmy.cn> Thu, 17 Sep 2026 10:35:00 +0800
|
||||
|
||||
marqdo (1.0.2-1ppa2) noble; urgency=medium
|
||||
|
||||
* Bundle Rust toolchain in orig (third_party/rust) so noble can build
|
||||
Cargo.lock v4 offline; drop distro cargo/rustc Build-Depends.
|
||||
* Architecture: amd64 (bundled toolchain is x86_64).
|
||||
|
||||
-- cflmy <pingan@cflmy.cn> Thu, 17 Sep 2026 10:20:00 +0800
|
||||
|
||||
marqdo (1.0.2-1ppa1) noble; urgency=medium
|
||||
|
||||
* Initial Ubuntu PPA packaging for Marqdo 1.0.2.
|
||||
* CLI only; extensions via "marqdo ext add" / ext.marqdo.com.
|
||||
|
||||
-- cflmy <pingan@cflmy.cn> Thu, 17 Sep 2026 09:55:00 +0800
|
||||
Vendored
+29
@@ -0,0 +1,29 @@
|
||||
Source: marqdo
|
||||
Section: devel
|
||||
Priority: optional
|
||||
Maintainer: cflmy <pingan@cflmy.cn>
|
||||
Build-Depends:
|
||||
debhelper-compat (= 13),
|
||||
build-essential,
|
||||
pkg-config,
|
||||
libssl-dev,
|
||||
ca-certificates
|
||||
Standards-Version: 4.7.0
|
||||
Homepage: https://github.com/cflmy/marqdo
|
||||
Vcs-Git: https://github.com/cflmy/marqdo.git
|
||||
Vcs-Browser: https://github.com/cflmy/marqdo
|
||||
Rules-Requires-Root: no
|
||||
|
||||
Package: marqdo
|
||||
Architecture: amd64
|
||||
Depends: ${shlibs:Depends}, ${misc:Depends}, ca-certificates
|
||||
Description: Markdown markers as an interpreted programming language
|
||||
Marqdo treats Markdown markers as executable syntax (code / return /
|
||||
control flow). This package installs the marqdo CLI.
|
||||
.
|
||||
Official extensions (web, quantum, …) are installed separately via
|
||||
"marqdo ext add" and download from https://ext.marqdo.com .
|
||||
.
|
||||
Launchpad builds use a bundled Rust toolchain under third_party/rust
|
||||
(Ubuntu noble cargo is too old for Cargo.lock v4). Rebuilds on newer
|
||||
series may use distro rustc if cargo ≥ 1.78.
|
||||
Vendored
+24
@@ -0,0 +1,24 @@
|
||||
Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
|
||||
Upstream-Name: marqdo
|
||||
Upstream-Contact: cflmy <pingan@cflmy.cn>
|
||||
Source: https://github.com/cflmy/marqdo
|
||||
|
||||
Files: *
|
||||
Copyright: 2024-2026 cflmy
|
||||
License: Apache-2.0
|
||||
|
||||
License: Apache-2.0
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
.
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
.
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
.
|
||||
On Debian systems, the complete text of the Apache License version 2
|
||||
can be found in "/usr/share/common-licenses/Apache-2.0".
|
||||
+58
@@ -0,0 +1,58 @@
|
||||
#!/usr/bin/make -f
|
||||
|
||||
export DH_VERBOSE = 1
|
||||
# Offline builds on Launchpad: vendored crates + optional bundled Rust toolchain.
|
||||
export CARGO_HOME = $(CURDIR)/debian/cargo_home
|
||||
export CARGO_NET_OFFLINE = true
|
||||
|
||||
# Noble (and older) distro cargo cannot read Cargo.lock v4 / modern crates.
|
||||
# Prefer third_party/rust from the orig tarball when present (see ppa-build-source.sh).
|
||||
BUNDLED_RUST = $(CURDIR)/third_party/rust
|
||||
ifneq ($(wildcard $(BUNDLED_RUST)/bin/cargo),)
|
||||
export PATH := $(BUNDLED_RUST)/bin:$(PATH)
|
||||
endif
|
||||
|
||||
%:
|
||||
dh $@
|
||||
|
||||
override_dh_auto_configure:
|
||||
mkdir -p debian/cargo_home
|
||||
@if [ -x "$(BUNDLED_RUST)/bin/cargo" ]; then \
|
||||
echo "Using bundled Rust: $$($(BUNDLED_RUST)/bin/rustc --version)"; \
|
||||
else \
|
||||
echo "Using system Rust: $$(rustc --version 2>/dev/null || echo missing)"; \
|
||||
fi
|
||||
@if [ -f "$(CURDIR)/.cargo/config.toml" ] || [ -d "$(CURDIR)/vendor" ]; then \
|
||||
echo "Using vendored Cargo dependencies"; \
|
||||
else \
|
||||
echo "WARNING: no vendor/ — online cargo fetch required (not for Launchpad)"; \
|
||||
fi
|
||||
|
||||
override_dh_auto_build:
|
||||
mkdir -p debian/cargo_home
|
||||
@command -v cargo >/dev/null || { echo "error: cargo not found (bundle third_party/rust or install rustc/cargo)" >&2; exit 1; }
|
||||
if [ -d "$(CURDIR)/vendor" ]; then \
|
||||
CARGO_NET_OFFLINE=true cargo build --release --locked --offline \
|
||||
-p marqdo; \
|
||||
else \
|
||||
cargo build --release --locked -p marqdo; \
|
||||
fi
|
||||
|
||||
override_dh_auto_test:
|
||||
@echo "Skipping full test suite on package build (run cargo test in CI)."
|
||||
|
||||
override_dh_auto_install:
|
||||
install -d $(CURDIR)/debian/marqdo/usr/bin
|
||||
install -m 0755 $(CURDIR)/target/release/marqdo \
|
||||
$(CURDIR)/debian/marqdo/usr/bin/marqdo
|
||||
|
||||
# dh_clean deletes *.orig by default; cargo vendor checksums require
|
||||
# vendor/**/Cargo.toml.orig. Exclude the vendored tree from that purge.
|
||||
override_dh_clean:
|
||||
dh_clean -Xvendor/
|
||||
|
||||
override_dh_auto_clean:
|
||||
dh_auto_clean
|
||||
rm -rf debian/cargo_home
|
||||
# keep vendor/ and third_party/rust (part of source package)
|
||||
-cargo clean
|
||||
Vendored
+1
@@ -0,0 +1 @@
|
||||
3.0 (quilt)
|
||||
Vendored
+2
@@ -0,0 +1,2 @@
|
||||
# Ignore temporary files while editing patches
|
||||
extend-diff-ignore = "^vendor/"
|
||||
+8
-1
@@ -15,7 +15,10 @@
|
||||
|
||||
| 文档 | 摘要 |
|
||||
|------|------|
|
||||
| [design/markdown-mapping.md](design/markdown-mapping.md) | **v0.1 语法宪法** |
|
||||
| [design/markdown-mapping.md](design/markdown-mapping.md) | **v0.2 语法宪法(现行运行时)** |
|
||||
| [design/markdown-mapping-v0.3.md](design/markdown-mapping-v0.3.md) | **v0.3 草案:叙述统一 · 粗体代码 · 斜体返回 · 形参体推断** |
|
||||
| [adr/0005-prose-unified-markup.md](adr/0005-prose-unified-markup.md) | **Proposed:采纳 mapping v0.3** |
|
||||
| [roadmap/markup-v0.3.md](roadmap/markup-v0.3.md) | **Markup v0.3 实现路线(M0–M5)** |
|
||||
| [design/objects.md](design/objects.md) | **`#` 对象 / `##` 函数与方法** |
|
||||
| [design/ai-skill.md](design/ai-skill.md) | **AI 接入 Skill**([`skills/marqdo/`](../skills/marqdo/)) |
|
||||
| [design/code-vs-comment.md](design/code-vs-comment.md) | 叙述 / 可执行 / 外联 |
|
||||
@@ -50,7 +53,11 @@
|
||||
| [design/ext-agent.md](design/ext-agent.md) | **官方扩展 `ext/agent`(文档驱动:单步 / 多步工作簿 + 自写回;废弃 thin TOOL 循环)** |
|
||||
| [design/ext-agent-plan.md](design/ext-agent-plan.md) | **`## 多步` / `## plan` 锁定设计**(工作簿文件、subtask 执行、修订循环、`step` 默认写回) |
|
||||
| [design/ext-cli.md](design/ext-cli.md) | **`marqdo ext list/add/remove` 官方扩展安装器** |
|
||||
| [design/ext-cdn.md](design/ext-cdn.md) | **扩展 CDN(R2 / ext.marqdo.com)与分开发版** |
|
||||
| [design/ubuntu-ppa.md](design/ubuntu-ppa.md) | **Ubuntu PPA 打包与上传** |
|
||||
| [design/ext-web.md](design/ext-web.md) | **官方扩展 `ext/web`(页面/库表/绑定/后台;ABI + CLI;设计锁定)** |
|
||||
| [design/ext-web-go-rewrite.md](design/ext-web-go-rewrite.md) | **`plugins/web` Go 全量重写**(多语言 ABI · 网页制备完备 · anlian 验收) |
|
||||
| [adr/0004-web-plugin-go.md](adr/0004-web-plugin-go.md) | **Accepted:web 原生插件实现语言为 Go** |
|
||||
| [research/ext-web-customization-limits.md](research/ext-web-customization-limits.md) | **`ext/web` 定制限制踩坑盘点**(路由/壳 CSS/鉴权/样式/部署) |
|
||||
| [design/ext-web-customization/](design/ext-web-customization/) | **对应解决设计**(C0–C4:前缀可让出、shell_css、gate、布局…) |
|
||||
| [design/web-assets-and-images.md](design/web-assets-and-images.md) | **W8:favicon / Head 资源表 / 图片装配**(一次补齐) |
|
||||
|
||||
@@ -0,0 +1,28 @@
|
||||
# ADR 0004:网络拓展库原生实现改为 Go
|
||||
|
||||
| | |
|
||||
|---|---|
|
||||
| Status | **Accepted** |
|
||||
| Date | 2026-09-10 |
|
||||
| Related | [ext-web-go-rewrite.md](../design/ext-web-go-rewrite.md) · [ext-abi.md](../design/ext-abi.md) · [0001-implementation-language.md](0001-implementation-language.md) |
|
||||
|
||||
## Context
|
||||
|
||||
- Marqdo **宿主/解释器**仍为 Rust(ADR 0001 不变)。
|
||||
- 官方插件契约是稳定 **C ABI**(`include/marqdo_abi.h`),不绑定 Rust ABI。
|
||||
- `plugins/web`(Rust/axum)已具备 W0–W8 等能力,但迭代成本高;且需验证多语言插件生态。
|
||||
- 产品目标:网络拓展库支撑完整网页制备,并以暗恋见君(外接 PostgreSQL + Redis)验收;应用层前后端均为 Marqdo 脚本。
|
||||
|
||||
## Decision
|
||||
|
||||
1. **重写** `plugins/web` 为 **Go** 共享库(`-buildmode=c-shared`),产物名仍为 `libweb.so` / `web.dll` / `libweb.dylib`。
|
||||
2. **ABI 全量兼容**(函数名、参数、语义);`ext/web` 作者面默认不动。
|
||||
3. 施工图:[ext-web-go-rewrite.md](../design/ext-web-go-rewrite.md)。禁止在旧 Rust 插件上继续打补丁演进(ext-web C5)。
|
||||
4. 其它官方插件(agent / quantum / linalg)**暂不**强制改语言;Go web 作为多语言样板。
|
||||
|
||||
## Consequences
|
||||
|
||||
- 构建与发版需安装 Go;CI/`marqdo ext add web` 增加 `go build` 回退。
|
||||
- 根 Cargo workspace 不再包含 `plugins/web` Rust crate(切换完成后)。
|
||||
- cgo/共享库生命周期与 `shutdown` 需严格测试。
|
||||
- 金样例 `tests/ext/web-*` 为门禁。
|
||||
@@ -0,0 +1,53 @@
|
||||
# ADR 0005:叙述统一的 Markup 映射(粗体即代码 · 斜体即返回 · 形参体推断)
|
||||
|
||||
| | |
|
||||
|---|---|
|
||||
| Status | **Accepted** |
|
||||
| Date | 2026-09-13 |
|
||||
| Related | [markdown-mapping-v0.3.md](../design/markdown-mapping-v0.3.md) · [markdown-mapping.md](../design/markdown-mapping.md) · [return-hr-and-code-surface.md](../design/return-hr-and-code-surface.md) · [roadmap/markup-v0.3.md](../roadmap/markup-v0.3.md) |
|
||||
|
||||
## Context
|
||||
|
||||
- Marqdo 的产品承诺是「代码即文档 / 文档即代码」:`.mq.md` 打开是文章,运行是程序。
|
||||
- v0.2([markdown-mapping.md](../design/markdown-mapping.md))为消歧做了硬隔离:无标记 = 注释;`*…*` = 语句;`**…**` = 返回;调用必须 `>`;形参必须 `` + `名` ``。
|
||||
- 该隔离使叙述与程序**视觉割裂**;且与 AI/Markdown 习惯相反(模型偏好用 `**` 强调「要做的事」)。
|
||||
- 产品方重新审视后,希望合法化如下写法:
|
||||
|
||||
```markdown
|
||||
## 加一函数
|
||||
对于输入变量`n`,我们执行操作**n=n+1**接着返回*n*。
|
||||
|
||||
# main
|
||||
> 加一函数 37
|
||||
或者可以直接这么调用**加一函数 37**
|
||||
```
|
||||
|
||||
## Decision
|
||||
|
||||
1. 采纳 **Markup 映射 v0.3** 为下一版语言宪法草案,全文见 [markdown-mapping-v0.3.md](../design/markdown-mapping-v0.3.md)。
|
||||
2. **角色对调**:`**…**` = 代码段(含可省略 `>` 的调用);`*…*` = 返回值。
|
||||
3. **叙述中的** `` `名` ``:**首次未赋值 = 声明变量**;未使用不报错;**仅当可执行面读取时升为形参**(见设计 §4.4 · §8.2)。不设「提及性」专用语法。
|
||||
4. **形参默认由函数体/叙述推断**(升参);`` + `名` `` 仅作迁移兼容。
|
||||
5. **`>` 调用面保留**(可选)。
|
||||
6. **空返回**用标记而非关键字:推荐 `---` / `***`;显式 `*None*` / `*无*`;整行 `**`;兼容 `****`(设计 §7.2)。
|
||||
7. **不做 v0.2 双模式兼容**(摸索阶段允许破坏性变更);旧 `.mq.md` 须改写。
|
||||
8. 金样例门禁:`tests/markup-v03/`;存量 suite 随后迁移。
|
||||
|
||||
## Consequences
|
||||
|
||||
### Positive
|
||||
|
||||
- 叙述与代码共用 Markdown 习惯,文档可读性上升。
|
||||
- 更贴合 AI 生成粗体「操作」的偏好,降低错用标记。
|
||||
- 去掉形参表仪式,函数更像「带名字的说明段落」。
|
||||
|
||||
### Negative / Risks
|
||||
|
||||
- **破坏性**:与 v0.2 金样例、Skill、教程、大量 `lib/`/`ext/` 源码不兼容,必须分波迁移或双模式。
|
||||
- 段内扫描与形参推断增加解析/语义复杂度——空返回与升参规则已在设计 §7.2 / §8.2 钉死;其余 §12 项用金样例收口。
|
||||
- view/catalog/LSP 高亮规则需同步。
|
||||
|
||||
### Neutral
|
||||
|
||||
- `#` / `##` 对象体系、标准库、插件 ABI、关键字最小集不变。
|
||||
- 输出仍是 `print` / `打印`,不是粗体/斜体。
|
||||
@@ -0,0 +1,54 @@
|
||||
# 方括号标记调用与前置修饰语
|
||||
|
||||
| | |
|
||||
|---|---|
|
||||
| 状态 | **Active** |
|
||||
| 日期 | 2026-09-14 |
|
||||
| 相关 | [call-arguments.md](call-arguments.md) · [collection-access-link.md](collection-access-link.md) · [markdown-mapping-v0.3.md](markdown-mapping-v0.3.md) |
|
||||
|
||||
---
|
||||
|
||||
## 1. 动机
|
||||
|
||||
无标记时,修饰语+函数名与函数名+实参都是词列,**无法消歧**。消歧标记必须来自 Marqdo 语法,**不能**依赖任一自然语言词法(「的」、形容词位置等)。
|
||||
|
||||
## 2. 形状
|
||||
|
||||
```text
|
||||
修饰语… [函数名] 实参…
|
||||
```
|
||||
|
||||
| 例子 | 含义 |
|
||||
|------|------|
|
||||
| `[问候] marqdo` | 调用 `问候`,位置实参 |
|
||||
| `礼貌 [问候] marqdo` | 另加 `礼貌=True` |
|
||||
| `正式 礼貌 [问候] marqdo` | `正式=True` `礼貌=True` |
|
||||
| `[结账摘要] 品名="拿铁" 杯数=2` | 仅具名实参 |
|
||||
| `[问候] ([格式化] `名字`)` | 嵌套:内层整段用 `()` |
|
||||
|
||||
旧形保留:`> 问候 …`、`**问候 …**`、`礼貌=True` 显式具名。
|
||||
|
||||
## 3. 与取元 / foreach
|
||||
|
||||
| 形状 | 语义 |
|
||||
|------|------|
|
||||
| `[X](Y)`(`]` 后**紧邻** `(`) | 取元 |
|
||||
| `[X]`(`]` 后不是 `(`) | 函数名标记 |
|
||||
| `- [X](Y)` | foreach |
|
||||
|
||||
## 4. 修饰语绑定
|
||||
|
||||
- `[` 前按空白切开;每段为标识(可 `` `名` ``)。
|
||||
- 降为 `Named(名, Bool(true))`,再与 `]` 后实参合并。
|
||||
- 与显式同名具名冲突 → 诊断。
|
||||
- **核心不剥语言词缀**;形参叫 `礼貌` 则写 `礼貌 [问候]`。
|
||||
|
||||
## 5. AST
|
||||
|
||||
`CallExpr.pre_modifiers: Vec<String>`;求值/字节码在绑参前展开。
|
||||
|
||||
## 6. 修订历史
|
||||
|
||||
| 日期 | 说明 |
|
||||
|------|------|
|
||||
| 2026-09-14 | 初稿并落地 |
|
||||
@@ -2,9 +2,9 @@
|
||||
|
||||
| | |
|
||||
|---|---|
|
||||
| 状态 | 已定(v0.1 增补) |
|
||||
| 状态 | 已定(v0.1 增补;2026-09-14:方括号标记调用) |
|
||||
| 日期 | 2026-08-07 |
|
||||
| 相关 | [markdown-mapping.md](markdown-mapping.md) · [keywords.md](keywords.md) · [module-namespace.md](module-namespace.md) |
|
||||
| 相关 | [markdown-mapping.md](markdown-mapping.md) · [keywords.md](keywords.md) · [module-namespace.md](module-namespace.md) · [bracket-call-modifiers.md](bracket-call-modifiers.md) |
|
||||
|
||||
---
|
||||
|
||||
@@ -16,20 +16,26 @@
|
||||
|------|------|------|
|
||||
| **具名**(保留) | `> 问候 谁=Marqdo` | `名=值`;值可含空格(至下一 `名=`) |
|
||||
| **位置**(新增) | `> 问候 Marqdo` | 按形参声明顺序绑定 |
|
||||
| **方括号标记**(增补) | `礼貌 [问候] Marqdo` | `[函数名]` 消歧;`[` 前裸词 → `名=True`;见 [bracket-call-modifiers.md](bracket-call-modifiers.md) |
|
||||
|
||||
二者可混用:位置实参按「尚未被具名绑定的形参」从左到右填充。具名不可绑定同一形参两次;位置实参不得出现在「已出现具名实参」之后(对齐常见「位置在前、关键字在后」习惯)。
|
||||
二者可混用:位置实参按「尚未被具名绑定的形参」从左到右填充。具名不可绑定同一形参两次;位置实参不得出现在「已出现具名实参」之后(对齐常见「位置在前、关键字在后」习惯)。前置修饰语与显式同名具名冲突则报错。
|
||||
|
||||
---
|
||||
|
||||
## 2. 文法(调用尾部)
|
||||
|
||||
```
|
||||
call_tail ::= callee arg*
|
||||
call_tail ::= bracket_call | classic_call
|
||||
bracket_call ::= modifier* '[' callee ']' arg*
|
||||
classic_call ::= callee arg*
|
||||
arg ::= named | positional
|
||||
named ::= ident '=' value
|
||||
positional ::= value_token
|
||||
positional ::= value_token | '(' call_tail ')'
|
||||
modifier ::= ident # 展开为 ident=True;核心不剥语言词缀
|
||||
```
|
||||
|
||||
- `]` 后**紧邻** `(` → **取元** `[key](collection)`,不是 callee 标记(见 [collection-access-link.md](collection-access-link.md))。
|
||||
- 嵌套调用:把内层整段放进 `()`,例如 `[问候] ([格式化] "x")`。
|
||||
- `value`(具名右侧):可含空格与 `` `var` `` 插值,直到下一个 `ident=` 边界。
|
||||
- `value_token`(位置):空白分隔的一个词法单元——数字、`` `名` ``、标识/文本词;**不含空格**。多词字符串请用具名,例如 `> print text=Hello World!`。
|
||||
- 实参值中 `` `变量` `` 后**紧跟** `[^…]` 时按**脚注取元**解析(可链式),而非文本:`> print text=苹果单价:`水果价格`[^苹果]`、`> print text=`订单`[^2][^品名]`。
|
||||
@@ -44,13 +50,14 @@ positional ::= value_token
|
||||
|
||||
## 3. 绑定算法
|
||||
|
||||
1. 收集具名 → 映射;冲突则报错。
|
||||
2. 按函数形参表顺序:若具名已提供则用之,否则取下一个位置实参。
|
||||
3. 位置实参有余、或必填形参仍缺 → 报错(内置 `input` 的 `prompt` 可缺省)。
|
||||
4. 用户函数:额外具名键仍写入调用环境(便于扩展);位置实参不可超过形参数目。
|
||||
1. 将前置修饰语展开为 `名=True` 具名(与显式具名冲突则报错)。
|
||||
2. 收集具名 → 映射;冲突则报错。
|
||||
3. 按函数形参表顺序:若具名已提供则用之,否则取下一个位置实参。
|
||||
4. 位置实参有余、或必填形参仍缺 → 报错(内置 `input` 的 `prompt` 可缺省)。
|
||||
5. 用户函数:额外具名键仍写入调用环境(便于扩展);位置实参不可超过形参数目。
|
||||
|
||||
---
|
||||
|
||||
## 4. 金样例
|
||||
|
||||
见 `tests/structure/positional-call.mq.md`、`tests/structure/ns/`(点号路径 / `use`)与 `tests/structure/import/`(导入解析)。
|
||||
见 `tests/structure/positional-call.mq.md`、`tests/structure/bracket-call.mq.md`、`tests/structure/ns/`(点号路径 / `use`)与 `tests/structure/import/`(导入解析)。
|
||||
@@ -0,0 +1,119 @@
|
||||
# 代码即文档 · 叙述面摩擦(v0.3 实测)
|
||||
|
||||
| | |
|
||||
|---|---|
|
||||
| 状态 | **Done** |
|
||||
| 日期 | 2026-09-14 |
|
||||
| 触发 | `examples/code-as-docs/index.mq.md` 试跑 |
|
||||
| 宪法 | [markdown-mapping-v0.3.md](markdown-mapping-v0.3.md) |
|
||||
| 路线 | [code-as-docs-gaps.md](../roadmap/code-as-docs-gaps.md) |
|
||||
|
||||
---
|
||||
|
||||
## 0. 原则
|
||||
|
||||
修复必须同时服务:
|
||||
|
||||
1. **代码即文档**:人读 Markdown 时自然段落、分隔线、强调不应被误伤。
|
||||
2. **适配 LLM 输出**:模型习惯写 `---` 分段、`**加粗强调**`、`0.85` 小数、`` map[^`key`] `` 动态键——运行时应尽量「写出来就能跑」。
|
||||
3. **可执行标记仍清晰**:真正的赋值 / 调用 / 返回不被误判成装饰。
|
||||
|
||||
---
|
||||
|
||||
## 1. 四个问题(实测)
|
||||
|
||||
### G1 — 模块级 `---` 被当成结构错误
|
||||
|
||||
| | |
|
||||
|---|---|
|
||||
| 现象 | 文件标题段落后写 Markdown 分隔线 `---`,报 `expected heading … got: ---` |
|
||||
| 根因 | 词法上整行 `-`/`*` 为 Code;旧实现把函数体内 `---` 当收束,模块顶却当非法。现统一为叙述跳过 |
|
||||
| 人/LLM 期望 | 任意处 `---` = GFM thematic break = **叙述噪音** |
|
||||
| 决议 | **处处** frame 行 skip;副作用收束用 `*None*` / `**` / `****`(返回即结束函数体解析) |
|
||||
|
||||
### G2 — 叙述里的 `**强调**` / `*斜体强调*` 被当成代码/返回
|
||||
|
||||
| | |
|
||||
|---|---|
|
||||
| 现象 | 「本文件既是**说明**也是**程序**」→ 粗体 `说明` 不是赋值/调用,解析失败;`*only*` 类英文强调升成返回/`only` 变量 |
|
||||
| 根因 | v0.3 叙述扫描凡 `**…**` / `*…*` 一律可执行([prose.rs](../../src/parse/prose.rs));Skill 曾禁止强调,但与 LLM/Markdown 习惯冲突 |
|
||||
| 人/LLM 期望 | 装饰性强调可出现;**像代码的**粗体/斜体仍执行 |
|
||||
| 决议 | **形状启发式**(见 §2):像代码则执行,否则当作叙述装饰(不产生 Stmt,不升参) |
|
||||
|
||||
### G3 — 小数面量 `0.85` 不可用
|
||||
|
||||
| | |
|
||||
|---|---|
|
||||
| 现象 | `**x = 0.85**` → `trailing input: ".85"`;`28 * 0.85` 解析错乱;即便进到求值,`*` 仍只接受 int |
|
||||
| 根因 | 表达式主词只吃整数字面量(`Literal` 无 `Num`);运行时已有 `Value::Num`,二元运算未接浮点 |
|
||||
| 人/LLM 期望 | `0.85`、`3.14`、`折扣=0.85` 可写可算 |
|
||||
| 决议 | 解析 `数字.数字` → `Literal::Num`;`*` `/` `+` `-` 及比较在 `Int`/`Num` 间提升(与已有 `cmp_ord` 一致) |
|
||||
|
||||
### G4 — 动态脚注键 `` 菜单[^`名`] ``
|
||||
|
||||
| | |
|
||||
|---|---|
|
||||
| 现象 | `` 菜单[^`名`] `` → `missing map key ``名`` `(把字面 `` `名` `` 当键,或解析失败) |
|
||||
| 根因 | `[^label]` 的 label 仅为**静态字符串**;AST `Expr::Index { label: String }` 无变量槽 |
|
||||
| 人/LLM 期望 | 表/映射按变量取键:`` `菜单`[^`品名`] `` 或 `菜单[^`品名`]` |
|
||||
| 决议 | 支持 `` [^`ident`] `` → 运行时用变量值作键(文本化后走现有 footnote get);静态 `[^拿铁]` 不变 |
|
||||
|
||||
---
|
||||
|
||||
## 2. 粗体/斜体「像代码」启发式
|
||||
|
||||
### 粗体 `**inner**` → 可执行,当且仅当
|
||||
|
||||
满足任一:
|
||||
|
||||
- 含 `=`(赋值 / 命名参数调用);或
|
||||
- 以 `>` 开头(显式调用);或
|
||||
- 含运算符 / 索引 / 调用形:`+ - * / ( ) [ ]`;或
|
||||
- 空白分词 ≥2 段,且其后段含数字面量、引号串、或 `=`(如 `**加一 37**`、`**print text="hi"**`)
|
||||
|
||||
否则(如 `**说明**`、`**代码即文档**`)→ **装饰,忽略**。
|
||||
|
||||
### 斜体 `*inner*` → 返回,当且仅当
|
||||
|
||||
满足任一:
|
||||
|
||||
- 空 / `None` / `无` / `空` / bool 字面;或
|
||||
- 以 `>` 开头;或
|
||||
- 含 `=` 或运算符 / 索引;或
|
||||
- **整行**仅为 `*…*`(含缩进)——整行返回 `*总额*` / `*n*`;或
|
||||
- 行内且前方紧邻「返回」二字(叙述「接着返回*n*」)
|
||||
|
||||
否则行内简单词(如 `*only*`、`*named*`)→ **装饰,忽略**。
|
||||
|
||||
> 整行 `*n*` 仍是返回;行内「返回*n*。」仍是返回。英文强调词在句中被忽略。
|
||||
|
||||
---
|
||||
|
||||
## 3. 非目标
|
||||
|
||||
- 不恢复 v0.2 双模式
|
||||
- 不引入 `if`/`return` 关键字
|
||||
- 不把任意 `**任意自然语言句子**` 都当代码(必须过 §2)
|
||||
- 动态键第一期只做 `` [^`ident`] ``,不做完整表达式 `[^a+b]`
|
||||
|
||||
---
|
||||
|
||||
## 4. 验收
|
||||
|
||||
| 用例 | 期望 |
|
||||
|------|------|
|
||||
| 顶层段落之间的 `---` | 可解析、可运行 |
|
||||
| 「既是**说明**也是**程序**」 | 可解析;无 Stmt |
|
||||
| `**应付 = 原价 * 0.85**` / `折扣`=0.85 | 数值正确(浮点) |
|
||||
| `` **价 = 菜单[^`名`]** ``(`名` 已绑定) | 取到对应价 |
|
||||
| `examples/code-as-docs/index.mq.md` | 用回浮点折扣与动态键后仍绿 |
|
||||
| 既有 `tests/markup-v03/*` 与 gold | 不回归 |
|
||||
|
||||
---
|
||||
|
||||
## 5. 修订历史
|
||||
|
||||
| 日期 | 说明 |
|
||||
|------|------|
|
||||
| 2026-09-14 | 初稿:四缝 + 启发式 + 验收 |
|
||||
| 2026-09-14 | 落地:G1–G4 实现 + 金样;顶层 Comment 引言 skip |
|
||||
@@ -2,8 +2,12 @@
|
||||
|
||||
| | |
|
||||
|---|---|
|
||||
| 状态 | 与 mapping v0.1 / keywords 对齐(成段注释) |
|
||||
| 日期 | 2026-08-04 |
|
||||
| 状态 | 与 mapping **v0.3** 对齐(现行运行时) |
|
||||
| 日期 | 2026-09-14 |
|
||||
| 取代 | 本文曾按 v0.2(`*语句*` / `**返回**`)叙述;旧对照见 [markdown-mapping.md](markdown-mapping.md) |
|
||||
| 相关 | [markdown-mapping-v0.3.md](markdown-mapping-v0.3.md) §4 |
|
||||
|
||||
「Markup」在此仓库 = Marqdo **把 Markdown 标记映射成语法** 的那一层,不是另一个语言。
|
||||
|
||||
---
|
||||
|
||||
@@ -11,19 +15,18 @@
|
||||
|
||||
| 层 | 形态 | 角色 |
|
||||
|----|------|------|
|
||||
| **叙述面** | 成段注释(空行分段) | 注释;段内任意标记无语义 |
|
||||
| **Marqdo 可执行面** | 结构标记 + `*语句*` + `**返回**` | 本语言程序 |
|
||||
| **叙述面** | 普通段落 | 注释;行内 `` `名` `` 可声明/引用;装饰性 `**强调**` / `*斜体*` 不执行 |
|
||||
| **Marqdo 可执行面** | 结构标记 + **`**代码**`** + **`*返回*`** | 本语言程序 |
|
||||
| **外联面** | ` ```lang ` | 其它语言(FFI) |
|
||||
|
||||
输出属于可执行面里的**函数调用**(`> print …`),见 [keywords.md](keywords.md)。
|
||||
输出属于可执行面里的**函数调用**(`> print …` / `**print …**`),见 [keywords.md](keywords.md)。
|
||||
|
||||
### 成段注释
|
||||
|
||||
- 以**空行**划分段落。
|
||||
- 段首行:首字符非标记 → 注释。
|
||||
- 段内续行:一律注释(即使以 `` ` `` / `-` / `**` 等开头)。
|
||||
- **例外**:整行仅为 `**expr**`(或 `****`)→ Marqdo **返回**;`**强调**` 后还有文字 → 仍是叙述注释。
|
||||
- 叙述段与可执行代码之间**必须空一行**,否则 `> print` 等会被吞进注释段。
|
||||
- 段首行:首字符非标记 → 注释段;段内续行一律叙述(即使以 `` ` `` / `-` 开头)。
|
||||
- 段内仍扫描行内可执行位:`` `名` ``、代码形 `**…**`、返回形 `*…*`。
|
||||
- 叙述段与独立结构行(`>` `#`)之间**建议空一行**,否则 `> print` 可能被吞进注释段。
|
||||
|
||||
---
|
||||
|
||||
@@ -31,8 +34,8 @@
|
||||
|
||||
| 标记/形式 | 角色 | 是否架构级 |
|
||||
|-----------|------|------------|
|
||||
| `*…*` | 程序语句 | 是 |
|
||||
| `**…**` | 返回值 | 是 |
|
||||
| `****` / 空粗体 | 空返回 + 结束函数体 | 是 |
|
||||
| `**…**` | 代码(赋值 / 调用 / 表达式语句) | 是 |
|
||||
| `*…*` | 返回值(整行、`返回*n*`、或表达式形) | 是 |
|
||||
| `****` / 整行 `**` / `*None*` | 空返回 + 结束函数体 | 是 |
|
||||
| `> print …` | 打印副作用 | 否(内置函数) |
|
||||
| 函数体 `---` / `***` | 结束函数体 | 是(边界) |
|
||||
| 函数体 `---` / `***` | 叙述分隔(跳过,**不**结束函数体) | 否 |
|
||||
@@ -0,0 +1,64 @@
|
||||
# 集合取元:GFM 链接形
|
||||
|
||||
| | |
|
||||
|---|---|
|
||||
| 状态 | **Active(运行时)** |
|
||||
| 日期 | 2026-09-14 |
|
||||
| 相关 | [tables-maps-footnotes.md](../roadmap/tables-maps-footnotes.md) · [markdown-mapping-v0.3.md](markdown-mapping-v0.3.md) · [code-as-docs-gaps.md](code-as-docs-gaps.md) |
|
||||
|
||||
---
|
||||
|
||||
## 1. 决议
|
||||
|
||||
表达式取元的**主语法**为 Markdown 链接外形,与 foreach 同构:
|
||||
|
||||
| 角色 | 写法 |
|
||||
|------|------|
|
||||
| **取元(表达式)** | `[键](集合)` |
|
||||
| **遍历(语句)** | `- [项](集合)`(不变) |
|
||||
| **脚注取元(过渡)** | `` 集合[^键] `` 仍解析,新代码勿写 |
|
||||
|
||||
心智:**方括号 = 取出的名字,圆括号 = 从哪取。**
|
||||
|
||||
```markdown
|
||||
**价 = [拿铁](菜单)**
|
||||
**价 = [`名`](菜单)**
|
||||
**第一 = [1](篮子)**
|
||||
|
||||
- [行](今日订单)
|
||||
**名 = [品名](行)**
|
||||
```
|
||||
|
||||
## 2. 细则
|
||||
|
||||
| 写法 | 语义 |
|
||||
|------|------|
|
||||
| `[拿铁](菜单)` | 静态键;`菜单` 为变量(粗体/斜体内) |
|
||||
| `` [`名`](菜单) `` | 动态键(求值 `名` 再作键) |
|
||||
| `[1](篮子)` | List **1-based** 下标(同脚注约定) |
|
||||
| `[1]([苹果](货架))` | 嵌套链式 |
|
||||
|
||||
与 `- [项](集合)` 消歧:仅 **表达式位置** 的 `[…](…)` 为取元;`-` 行头仍为 foreach。
|
||||
|
||||
## 3. 迁移
|
||||
|
||||
`` `菜单`[^拿铁] `` / `菜单[^拿铁]` → `[拿铁](菜单)`(**基与键左右对调**)。
|
||||
|
||||
| 区域 | 约定 |
|
||||
|------|------|
|
||||
| 新代码 / examples / public | **只用**链接形 |
|
||||
| `tests/structure/footnote*` · `interp-footnote*` | 脚注兼容门禁(保留) |
|
||||
| 其余 structure / ext / lib 金样 | 已迁链接形 |
|
||||
|
||||
脚注路径保留至另行决定移除之日;Skill / 教程 / 新示例只用链接形。
|
||||
|
||||
## 4. 非目标
|
||||
|
||||
- 点号 map 访问、`在`、箭头取元、`(键)[集合]`
|
||||
- 循环语法糖(`←` / `in` / 自然语言)
|
||||
|
||||
## 5. 修订历史
|
||||
|
||||
| 日期 | 说明 |
|
||||
|------|------|
|
||||
| 2026-09-14 | 初稿并落地主语法 |
|
||||
@@ -16,27 +16,17 @@
|
||||
tests/
|
||||
README.md
|
||||
gold.rs # 集成测试入口
|
||||
structure/ # 代码基础结构(Markup 架构)
|
||||
hello.mq.md
|
||||
nested-call.mq.md
|
||||
positional-call.mq.md
|
||||
branch.mq.md
|
||||
loop.mq.md
|
||||
collection.mq.md
|
||||
import/
|
||||
main.mq.md
|
||||
utils.mq.md
|
||||
ns/
|
||||
helpers.mq.md
|
||||
path3.mq.md
|
||||
use.mq.md
|
||||
structure/ # 代码基础结构(Markup 架构 · v0.2)
|
||||
…
|
||||
keywords/ # 关键字与内置名
|
||||
print.mq.md
|
||||
bool-logic.mq.md
|
||||
…
|
||||
markup-v03/ # Markup 映射 v0.3 草案金样例(实现前 ignore)
|
||||
README.md
|
||||
inc-prose.mq.md
|
||||
…
|
||||
ext/
|
||||
agent-run-live.mq.md
|
||||
…
|
||||
errors/ # 期望失败(诊断文案稳定后再加金样例)
|
||||
ns-instance-method.mq.md
|
||||
…
|
||||
```
|
||||
|
||||
@@ -51,6 +41,7 @@ tests/
|
||||
|------|--------|----------|
|
||||
| **structure** | `#`/`##`、形参 `+`、`1.` 分支、`-` 循环、表、导入、点号路径 / `use`、位置/具名实参 | 关键字边角 |
|
||||
| **keywords** | `True`/`False`/`None`、`and`/`or`/`not`、`print`/`input` 约定 | 复杂控制流(可极简) |
|
||||
| **markup-v03** | v0.3:叙述声明、粗体代码、斜体返回、升参、空返回、双调用面(见 [markdown-mapping-v0.3.md](markdown-mapping-v0.3.md)) | 在 `--markup v0.3` 落地前 `#[ignore]` |
|
||||
| **errors** | 未定义名、实参错误、语法错误的诊断 | 成功路径 |
|
||||
|
||||
未单独建夹、但应覆盖的其它测试(`src/**` 单测或日后 `tests/runtime/`):
|
||||
|
||||
@@ -85,7 +85,7 @@ cargo build -p marqdo_plugin_agent
|
||||
|
||||
- Demo (ABI v1): `demo_add`, `demo_echo` — [`tests/lib/plugin-demo.mq.md`](../../tests/lib/plugin-demo.mq.md).
|
||||
- Agent (ABI v2): … **OKF agent-kb** …
|
||||
- Web (ABI v2): HTTP listen + SQLite + page render (`web_listen`, `web_render`, `web_db_*`) — [`plugins/web`](../../plugins/web); used by [`ext/web/web.mq.md`](../../ext/web/web.mq.md). Lookup: `plugin.native_path name=web` / `MARQDO_WEB_PLUGIN` / `marqdo ext add web`.
|
||||
- Web (ABI v2): HTTP listen + SQLite/Postgres + page render (`web_listen`, `web_render`, `web_db_*`, …) — [`plugins/web`](../../plugins/web)(**Go 全量重写**,见 [ext-web-go-rewrite.md](ext-web-go-rewrite.md) · [ADR 0004](../adr/0004-web-plugin-go.md));作者面 [`ext/web/web.mq.md`](../../ext/web/web.mq.md)。Lookup: `plugin.native_path name=web` / `MARQDO_WEB_PLUGIN` / `marqdo ext add web`.
|
||||
|
||||
## Layering
|
||||
|
||||
|
||||
@@ -0,0 +1,66 @@
|
||||
# Extension CDN (Cloudflare R2 → https://ext.marqdo.com)
|
||||
|
||||
| | |
|
||||
|---|---|
|
||||
| Status | **Accepted** — download prefer CDN; upload via `scripts/upload-ext-r2.py` |
|
||||
| Date | 2026-09-17 |
|
||||
| Related | [ext-cli.md](ext-cli.md) · [marqdo-release](../../.cursor/skills/marqdo-release/SKILL.md) |
|
||||
|
||||
## Why
|
||||
|
||||
CLI (语法解释器) and official **extension packs** (`ext/` L1 + native plugins) update on different cadences. Users behind unstable GitHub links should get packs from a stable object store first.
|
||||
|
||||
## Public URL layout
|
||||
|
||||
Bucket: `marqdo` · Custom domain: **https://ext.marqdo.com**
|
||||
|
||||
| Key | Meaning |
|
||||
|-----|---------|
|
||||
| `v{VER}/marqdo-{VER}-ext.zip` | L1 sources |
|
||||
| `v{VER}/marqdo-{VER}-native-{triple}.zip` | Prebuilt plugins |
|
||||
| `v{VER}/VERSION` | Pack SemVer echo |
|
||||
| `latest/VERSION` | Recommended pack SemVer (plain text) |
|
||||
| `latest/marqdo-…zip` | Same assets mirrored for convenience |
|
||||
|
||||
`{VER}` is the **extension pack** version (`ext/VERSION`), which **may differ** from CLI `Cargo.toml` version.
|
||||
|
||||
## Client download order (`marqdo ext add`)
|
||||
|
||||
1. `MARQDO_EXT_DOWNLOAD_BASE` (optional override)
|
||||
2. **CDN** `https://ext.marqdo.com/v{VER}/…` (override host with `MARQDO_EXT_CDN`)
|
||||
3. GitHub Releases
|
||||
4. `https://proxy.cflmy.top/github.com/…`
|
||||
|
||||
Pack SemVer resolution (`release_version()`):
|
||||
|
||||
1. `MARQDO_EXT_VERSION`
|
||||
2. CDN `GET …/latest/VERSION` (short timeout)
|
||||
3. Embedded `ext/VERSION` at build time
|
||||
4. CLI `CARGO_PKG_VERSION`
|
||||
|
||||
## Separate ext release (no CLI bump)
|
||||
|
||||
1. Bump `ext/VERSION` (e.g. `1.0.3`) — leave root `Cargo.toml` alone if CLI unchanged.
|
||||
2. Build native zips (CI Linux/Windows jobs or local `scripts/build-web-plugin.sh` + cargo plugins).
|
||||
3. Package `marqdo-{VER}-ext.zip` and `marqdo-{VER}-native-*.zip`.
|
||||
4. Upload **both**:
|
||||
- R2: `python3 scripts/upload-ext-r2.py --version VER --from-dir dist/`
|
||||
- GitHub: attach to a GitHub Release (tag `ext-vVER` **or** reuse latest CLI release assets)
|
||||
5. Confirm `https://ext.marqdo.com/latest/VERSION` and a sample zip URL return 200.
|
||||
|
||||
## Full product release (CLI + ext)
|
||||
|
||||
Keep `ext/VERSION` equal to (or compatible with) CLI SemVer unless documenting a deliberate skew. CI still publishes GitHub assets; **after** CI green, run `upload-ext-r2.py` so CDN is populated (or add a CI step with R2 secrets).
|
||||
|
||||
## Credentials
|
||||
|
||||
| Where | What |
|
||||
|-------|------|
|
||||
| Local | `~/.marqdo/r2.env` (`chmod 600`) — see `.env.r2.example` |
|
||||
| CI (optional) | GitHub Actions secrets: `R2_ACCESS_KEY_ID`, `R2_SECRET_ACCESS_KEY`, `R2_ENDPOINT`, `R2_BUCKET` |
|
||||
|
||||
**Never** commit Account API tokens or S3 secret keys. If a token was pasted into chat, **rotate** it in the Cloudflare dashboard.
|
||||
|
||||
## Object ACL
|
||||
|
||||
Custom domain public reads require the bucket/objects to be publicly readable (R2 public bucket / r2.dev / custom domain). Uploads use S3 API credentials; downloads by `ext add` are anonymous HTTPS GETs.
|
||||
+11
-3
@@ -35,9 +35,11 @@ and get both L1 `.mq.md` **and** the matching native plugin (`.dll` / `.so`) **w
|
||||
|
||||
### Resolution order (`add` with native crate)
|
||||
|
||||
1. Local artifact (`MARQDO_*_PLUGIN`, `target/{debug,release}`, beside `marqdo`, `MARQDO_EXT_SOURCE/native`, …)
|
||||
1. Local artifact (`MARQDO_*_PLUGIN`, `plugins/web/build` for **web**, `target/{debug,release}`, beside `marqdo`, `MARQDO_EXT_SOURCE/native`, …)
|
||||
2. **Download** `marqdo-{VER}-native-{target}.zip` from the GitHub Release for this CLI version → cache under `~/.marqdo/cache/`
|
||||
3. If Rust/`cargo` is available → `cargo build -p marqdo_plugin_*` (developers)
|
||||
3. Local rebuild fallback:
|
||||
- **web** → `./scripts/build-web-plugin.sh` (Go c-shared `libweb`; requires Go 1.22+ / cgo)
|
||||
- other plugins → `cargo build -p marqdo_plugin_*` when Rust/`cargo` is available
|
||||
4. Else fail with a clear message pointing at the Release assets
|
||||
|
||||
L1 sources:
|
||||
@@ -49,10 +51,16 @@ L1 sources:
|
||||
|
||||
| Variable | Meaning |
|
||||
|----------|---------|
|
||||
| `MARQDO_EXT_VERSION` | Override SemVer used for Release asset names (default: CLI `CARGO_PKG_VERSION`) |
|
||||
| `MARQDO_EXT_VERSION` | Override **extension pack** SemVer (default: CDN `latest/VERSION` → embedded `ext/VERSION` → CLI version) |
|
||||
| `MARQDO_EXT_CDN` | Public CDN base (default `https://ext.marqdo.com`) |
|
||||
| `MARQDO_EXT_NO_DOWNLOAD=1` | Never hit the network (CI / air-gap); local/cargo only |
|
||||
| `MARQDO_EXT_DOWNLOAD_BASE` | Optional extra base tried **before** CDN |
|
||||
| `MARQDO_WEB_PLUGIN` / `MARQDO_AGENT_PLUGIN` / `MARQDO_QUANTUM_PLUGIN` | Explicit native path |
|
||||
|
||||
Download order for each Release asset: `MARQDO_EXT_DOWNLOAD_BASE` → **CDN `ext.marqdo.com`** → `github.com` → **`proxy.cflmy.top`**. Connect timeout 20s; read timeout 10min.
|
||||
|
||||
See [ext-cdn.md](ext-cdn.md) for R2 layout, separate ext releases, and `scripts/upload-ext-r2.py`.
|
||||
|
||||
Windows Release **zip** also ships `ext/` + `ext/native/*.dll` next to `marqdo.exe` so a portable unzip works offline after one download.
|
||||
|
||||
## Source for `add` (developers)
|
||||
|
||||
@@ -0,0 +1,19 @@
|
||||
# Collaborative document MVP
|
||||
|
||||
| | |
|
||||
|---|---|
|
||||
| 状态 | **Accepted · MVP (LWW)** |
|
||||
| 日期 | 2026-09-17 |
|
||||
|
||||
## Approach
|
||||
|
||||
Not a full CRDT. Peers sync plain text over `route_ws mode=room` with:
|
||||
|
||||
- Client → server: `DOC\\t<body>`
|
||||
- Server fan-out (existing G-WS1/2)
|
||||
- Apply remote if body ≠ local; `applying` flag suppresses echo
|
||||
- Presence JSON on `room.presence` (`presence=True`)
|
||||
|
||||
## Demo
|
||||
|
||||
`examples/web-collab-doc/` — open two browsers on the same room.
|
||||
@@ -0,0 +1,454 @@
|
||||
# `plugins/web` Go 全量重写(多语言 ABI 生态 · 网页制备完备)
|
||||
|
||||
| | |
|
||||
|---|---|
|
||||
| 状态 | **Completed(W-G0…W-G14 · v0.4.0)** |
|
||||
| 日期 | 2026-09-10 |
|
||||
| 相关 | [ext-web.md](ext-web.md) · [ext-web-net.md](ext-web-net.md) · [web-net-capabilities.md](web-net-capabilities.md) · [ext-web-drivers.md](ext-web-drivers.md) · [web-assets-and-images.md](web-assets-and-images.md) · [ext-hosting-fill.md](ext-hosting-fill.md) · [ext-abi.md](ext-abi.md) · [ext-cli.md](ext-cli.md) · [web-asgi-servers-and-marqdo.md](web-asgi-servers-and-marqdo.md) |
|
||||
| 实现目录 | `plugins/web/`(**Go module**;产物仍为 `libweb.so` / `web.dll` / `libweb.dylib`) |
|
||||
| 作者面 | `ext/web/web.mq.md` · `ext/web/网页.mq.md`(**ABI 名与方法面保持兼容**;非另起一套 API) |
|
||||
| 验收应用 | 工作区 `anlian`(暗恋见君):用 Marqdo 前后端脚本完整重写;**PostgreSQL + Redis 外接** |
|
||||
|
||||
---
|
||||
|
||||
## 0. 一句话
|
||||
|
||||
用 **Go** 重写官方网络拓展库原生层(`plugins/web`),在 **C ABI v2 全量兼容** 前提下提供「网页制备」所需的全部服务端能力;`ext/web` 继续用 GFM 表 + `#` 类做作者面;应用(含暗恋见君)的前后端脚本全部用 Marqdo 书写。此举同时验证 **多语言 ABI 插件生态**(首个非 Rust 官方插件)。
|
||||
|
||||
**不是**最小 hello 插件;**不是**在旧 Rust 代码上打补丁(对齐 [ext-web.md](ext-web.md) **C5**)。
|
||||
|
||||
---
|
||||
|
||||
## 1. 动机与目标
|
||||
|
||||
### 1.1 为何重写
|
||||
|
||||
| 动机 | 说明 |
|
||||
|------|------|
|
||||
| 开发/编译节奏 | Rust 插件迭代慢,网络域能力长期「半成品感」来自堆叠依赖与慢反馈,而非语言绝对性能 |
|
||||
| 多语言生态 | ABI 已是稳定 C 契约;需要第一个 **Go** 官方插件证明「宿主 Rust ≠ 插件必须 Rust」 |
|
||||
| 网页制备完备 | 目标是支持 **完整动态站点制备**(装配、CRUD、鉴权、实时、上传、SEO、代理、驱动…),并以真实论坛项目验收 |
|
||||
| 性能与拉起 | Go `net/http` 生态成熟、单二进制友好;论坛级 IO 密集负载下足够「极致可用」 |
|
||||
|
||||
### 1.2 成功标准(全部满足才算完成)
|
||||
|
||||
1. **ABI 全量对等**:下文 §5 列出的每一个已注册 `web_*` 符号,参数 CSV、JSON 形、语义与现网 gold 一致(中英参数别名保留)。
|
||||
2. **作者面可用**:现有 `ext/web` 示例与 `tests/ext/web-*`(含 live-server)在换 Go `.so` 后通过;无需作者改业务脚本(除非文档标明的 **G 增强**)。
|
||||
3. **网页制备完备**:单站点可完成页面装配、样式/头/图、库表、表单、路由、中间件、鉴权/RBAC、上传下载、SEO/RSS/sitemap、WS、缓存、对象存储、反代、invoke——即 W0–W8 + P3 + C0–C4 + H1/H2 能力面。
|
||||
4. **驱动外接**:`postgres://`、`redis://`、`s3://` 为正式一等能力(与 [ext-web-drivers.md](ext-web-drivers.md) 一致);SQLite / memory / file 仍支持本地与测试。
|
||||
5. **暗恋见君可写完**:用 Marqdo 后端脚本 + 浏览器 WASM 前端脚本重写 anlian 核心模块(见 §8);运行时仅依赖 `marqdo` + `libweb` + **外接 PostgreSQL + Redis**(可选 S3/RustFS)。
|
||||
6. **安装路径不变**:`marqdo ext add web`、`plugin.native_path name=web`、`MARQDO_WEB_PLUGIN`、产物文件名 `libweb.so` 等与 [ext-cli.md](ext-cli.md) 兼容。
|
||||
|
||||
### 1.3 非目标
|
||||
|
||||
| 非目标 | 说明 |
|
||||
|--------|------|
|
||||
| 改 Marqdo 核心语法 | 仍遵守 ext-web **C1** |
|
||||
| 把服务器搬进浏览器 WASM | 仍遵守 ADR 0002 |
|
||||
| 进程内 TLS | HTTPS 由反代;`cookie_secure` 保留 |
|
||||
| 第三方插件市场 | 仍无 registry |
|
||||
| 把论坛业务写进 Go 插件 | 帖子/新闻/聊天室规则在 `.mq.md`;插件只提供原语 |
|
||||
| 强制嵌入式替代 PG/Redis | 本项目明确 **允许并依赖外接** PG/Redis |
|
||||
|
||||
---
|
||||
|
||||
## 2. 分层架构(锁定)
|
||||
|
||||
```text
|
||||
┌──────────────────────────────────────────────────────────────────┐
|
||||
│ 应用(anlian / 任意站点) │
|
||||
│ · 后端 .mq.md:路由、业务、装配、invoke 处理函数 │
|
||||
│ · 前端 .mq.md:WASM + lib/browser(作者零业务 JS) │
|
||||
└────────────────────────────┬─────────────────────────────────────┘
|
||||
│ import web / 网页
|
||||
┌────────────────────────────▼─────────────────────────────────────┐
|
||||
│ ext/web(L1 · Marqdo) │
|
||||
│ # page # db # app # form # auth # cache # storage # media # ws │
|
||||
│ make_style / make_head / make_images / client_embed … │
|
||||
└────────────────────────────┬─────────────────────────────────────┘
|
||||
│ lib/plugin → dlopen
|
||||
┌────────────────────────────▼─────────────────────────────────────┐
|
||||
│ plugins/web(L0 · Go · C ABI v2) ← 本文件重写对象 │
|
||||
│ net/http + 驱动适配 + HTML 装配 + WS hub + 中间件 … │
|
||||
└──────────┬─────────────────┬─────────────────┬───────────────────┘
|
||||
│ │ │
|
||||
PostgreSQL Redis S3/MinIO/RustFS
|
||||
(外接) (外接) (可选外接)
|
||||
```
|
||||
|
||||
| 层 | 语言 | 职责 |
|
||||
|----|------|------|
|
||||
| 应用脚本 | Marqdo | 前后端业务、页面表、领域模型 |
|
||||
| `ext/web` | Marqdo | 双语作者 API;禁止直接 `host_*` |
|
||||
| `plugins/web` | **Go** | 全部 `web_*` ABI;高性能网络与驱动 |
|
||||
| `lib/net` | Marqdo + Rust host | **仅**客户端 HTTP / cookie / multipart / markdown **解析**;不进本重写范围(边界不变) |
|
||||
| 宿主 | Rust | `dlopen`、JSON Value、`host_query`(`entry_dir` / `call_lib_path` …) |
|
||||
|
||||
---
|
||||
|
||||
## 3. 硬约束(继承 + 本重写追加)
|
||||
|
||||
### 3.1 继承 ext-web C1–C7
|
||||
|
||||
| ID | 约束 |
|
||||
|----|------|
|
||||
| C1 | 不为 web 改核心语法 |
|
||||
| C2 | 作者面禁止 json 袋胶水拼装页面 |
|
||||
| C3 | 中英 API 分文件;禁止混排 |
|
||||
| C4 | 首页 `index.mq.md`;组件可拆 |
|
||||
| C5 | **禁止在旧 Rust 插件上打补丁演进**;清空/替换后用 Go 重写 |
|
||||
| C6 | `# db` 完整 CRUD;`select`/`查询`;admin 与表单共用写库 API |
|
||||
| C7 | 表单字段+规则;**写库前服务端校验** |
|
||||
|
||||
### 3.2 本重写追加(G 系列)
|
||||
|
||||
| ID | 约束 |
|
||||
|----|------|
|
||||
| **G1** | 产物仍为 C ABI v2;`MARQDO_ABI_VERSION = 2`;导出符号名与 [include/marqdo_abi.h](../../include/marqdo_abi.h) 一致 |
|
||||
| **G2** | **ABI 函数名与参数名向后兼容**:§5 清单中每个 `web_*` 必须注册;参数 CSV 与现 Rust 插件一致(含中文别名) |
|
||||
| **G3** | Go 使用 `-buildmode=c-shared`;**禁止**把 Go runtime 假设成唯一线程——跨 FFI 调用必须可重入或明确串行化文档 |
|
||||
| **G4** | `marqdo_plugin_shutdown` 必须停止 HTTP/WS、关闭 DB/Redis 连接、释放 hub |
|
||||
| **G5** | 字符串跨界:成功时 `*out_json` / 失败时 `*err_msg` 必须用 **host `alloc`** 分配(与现插件相同),由宿主 `free` |
|
||||
| **G6** | 相对路径(sqlite 文件、静态目录、上传根)一律相对 `host_query("entry_dir")` |
|
||||
| **G7** | 多语言样板:仓库内保留可复用的 Go ABI 脚手架注释/包结构,供后续其它语言插件参考 |
|
||||
| **G8** | 金样例不过 = 未完成;切换默认 `libweb` 到 Go 后,既有 `tests/ext/web-*` 必须绿 |
|
||||
|
||||
---
|
||||
|
||||
## 4. 技术选型(Go)
|
||||
|
||||
| 能力 | 选型 | 备注 |
|
||||
|------|------|------|
|
||||
| HTTP 服务器 | 标准库 `net/http` | 路由可用轻量自研 mux 或 `chi`/`http.ServeMux`(Go 1.22+ 模式) |
|
||||
| 中间件 | 自研链式 `func(http.Handler) http.Handler` | 对等 CORS / 安全头 / gzip / body limit / access_log / cache-control |
|
||||
| WebSocket | `gorilla/websocket` 或 `coder/websocket` | 对等 echo / broadcast / drain;**G 增强**:命名房间(§7) |
|
||||
| SQLite | `modernc.org/sqlite`(纯 Go)或 `mattn/go-sqlite3`(cgo) | 优先纯 Go 以便交叉编译;FTS5/migrate 行为对齐 |
|
||||
| PostgreSQL | `jackc/pgx/v5` | `postgres://` / `postgresql://` |
|
||||
| Redis | `redis/go-redis/v9` | `# cache`;**G 增强**:可选 session/WS 后端 |
|
||||
| S3 | `aws-sdk-go-v2` 或 MinIO SDK | `s3://`;兼容 RustFS |
|
||||
| 密码 | `golang.org/x/crypto/argon2` | argon2id 参数对齐现实现 |
|
||||
| Markdown | `goldmark`(GFM 扩展) | 对等 `pulldown-cmark` 用途(正文 HTML) |
|
||||
| JSON | `encoding/json` | ABI 边界 |
|
||||
| 构建 | `go build -buildmode=c-shared -o libweb.so` | 见 §9 |
|
||||
|
||||
**不引入**完整 Web 框架(Gin/Echo 业务层)以免作者面旁路;框架能力用 Marqdo `# app` 表达。
|
||||
|
||||
---
|
||||
|
||||
## 5. ABI 全量清单(必须注册 · 兼容)
|
||||
|
||||
> 参数列为注册时 `params` CSV(英;实现须同时接受设计中已有的中文键别名,与现 `lib.rs` 一致)。
|
||||
> 状态列:`P0` = 首波必须与 gold 对齐;实现顺序见 §10。
|
||||
|
||||
### 5.1 Page / compose / assets / render
|
||||
|
||||
| ABI | params(摘要) | 域 |
|
||||
|-----|----------------|-----|
|
||||
| `web_page_new` | (空或 title 等,对齐现实现) | page |
|
||||
| `web_compose_components` | page, components, … | compose |
|
||||
| `web_compose_main` | page, main, … | compose |
|
||||
| `web_page_query` | page, query | page |
|
||||
| `web_page_order` | page, order | page |
|
||||
| `web_page_link_prefix` | page, prefix | page |
|
||||
| `web_page_css` | page, css | page |
|
||||
| `web_page_detail` | page, … | page |
|
||||
| `web_page_meta` | page, meta | SEO |
|
||||
| `web_page_head` | page, head | W8 |
|
||||
| `web_page_images` | page, images | W8 |
|
||||
| `web_page_paginate` | page, … | content |
|
||||
| `web_head` | table / … | W8 |
|
||||
| `web_images` | table / … | W8 |
|
||||
| `web_app_icons` | app, icons | W8 |
|
||||
| `web_style` | table, strict? | CSS |
|
||||
| `web_compose_form` | page, form, target? | form embed |
|
||||
| `web_render` | page | HTML |
|
||||
|
||||
### 5.2 SEO / ops routes
|
||||
|
||||
| ABI | 域 |
|
||||
|-----|-----|
|
||||
| `web_rss_build` | RSS |
|
||||
| `web_app_route_rss` | app |
|
||||
| `web_app_redirect` | app |
|
||||
| `web_app_error_page` | app |
|
||||
| `web_app_sitemap` | app |
|
||||
| `web_app_robots` | app |
|
||||
| `web_sitemap_build` | sitemap |
|
||||
|
||||
### 5.3 Upload / media
|
||||
|
||||
| ABI | 域 |
|
||||
|-----|-----|
|
||||
| `web_app_upload` | app |
|
||||
| `web_app_download` | app |
|
||||
| `web_upload_validate` | media |
|
||||
| `web_upload_save` | media |
|
||||
| `web_media_new` | media |
|
||||
| `web_app_gallery` | app |
|
||||
|
||||
### 5.4 Database
|
||||
|
||||
| ABI | 备注 |
|
||||
|-----|------|
|
||||
| `web_db_new` | `sqlite:` / `postgres://` |
|
||||
| `web_db_init` | unique / index / fk / 审计时间戳 |
|
||||
| `web_db_insert` / `select` / `get` / `update` / `delete` / `exec` | CRUD |
|
||||
| `web_db_query` / `count` | 原生 / 计数 |
|
||||
| `web_db_migrate` | **SQLite only**(对等) |
|
||||
| `web_db_fts_create` / `web_db_search` | **SQLite only** |
|
||||
| `web_db_begin` / `commit` / `rollback` | 事务句柄 |
|
||||
| `web_db_list_tables` / `web_db_table_info` | admin 内部 |
|
||||
|
||||
Where 语义:等值 map、filter 表、OR / IN / BETWEEN、分页 offset/limit——行为对齐现 `db.rs` / `db_pg.rs`。
|
||||
|
||||
### 5.5 Cache / storage
|
||||
|
||||
| ABI | URL |
|
||||
|-----|-----|
|
||||
| `web_cache_new` / `get` / `set` / `del` / `exists` / `ttl` | `memory:` / `redis://` |
|
||||
| `web_storage_new` / `put` / `get` / `delete` / `list` | `file:` / `s3://` |
|
||||
|
||||
### 5.6 App / HTTP / hosting
|
||||
|
||||
| ABI | 域 |
|
||||
|-----|-----|
|
||||
| `web_app_new` | app |
|
||||
| `web_app_route` | 动态 `{param}` + `/_part` |
|
||||
| `web_app_mount_form` | `/_form` |
|
||||
| `web_app_static` | 静态目录 |
|
||||
| `web_app_middleware` | `configure`:CORS、安全头、gzip、body_limit、JSON API、access_log、cache_control |
|
||||
| `web_app_proxy` | 流式反代 / SSE(H1) |
|
||||
| `web_app_invoke` | HTTP → `lib.member`(H2;经 `host_query call_lib_path`) |
|
||||
| `web_listen` | 阻塞监听;组装全部路由 |
|
||||
| `web_app_route_ws` | WS 端点 |
|
||||
| `web_ws_connect` | 客户端单次请求-响应式 |
|
||||
| `web_app_auth` | `/admin` 门禁 |
|
||||
| `web_app_gate` | RBAC 段前缀 |
|
||||
|
||||
### 5.7 Form
|
||||
|
||||
| ABI |
|
||||
|-----|
|
||||
| `web_form_new` / `fields` / `rules` / `validate` / `render` / `submit` / `from_schema` |
|
||||
|
||||
规则:`required`、`min:N`、`max:N`、`email`、`url`、`match:field`、`in:a,b,c`。
|
||||
|
||||
### 5.8 Session / auth
|
||||
|
||||
| ABI |
|
||||
|-----|
|
||||
| `web_session_new` / `set` / `get` / `del` / `destroy` |
|
||||
| `web_auth_new` / `login` / `check` / `logout` |
|
||||
| `web_password_hash` |
|
||||
|
||||
安全对等:argon2id、CSRF、登录限速、CSPRNG session id、cookie Secure(配置)、滑动 TTL、持久化会话(默认 SQLite 会话表;见 §7 Redis 可选)。
|
||||
|
||||
### 5.9 HTTP 挂载面(`web_listen` 必须复现)
|
||||
|
||||
- `GET /`,`GET /_part/{id}`,`GET|POST /_form/{id}`
|
||||
- 可选 admin:`{prefix}/`、`/login`、`/logout`、`/{table}`、`/new`、`/{id}/edit`、`/{id}/delete`(C0:`admin=False` 让出 `/admin`)
|
||||
- 作者 `route` 页 + `{path}/_part/{id}`;动态路径参数
|
||||
- WS;RSS;upload POST;download GET;gallery;sitemap;`/robots.txt`
|
||||
- 301/307 重定向;自定义 404/500;proxy;invoke
|
||||
- 静态与 icons;约定 `/favicon.ico`
|
||||
- 保留名:`/_form`、`/_part`、静态挂载冲突检测
|
||||
|
||||
### 5.10 `host_query` 依赖
|
||||
|
||||
| name | 用途 |
|
||||
|------|------|
|
||||
| `entry_dir` | 路径沙箱根 |
|
||||
| `call_lib_path` | invoke / 嵌套 lib 调用(含 `args`) |
|
||||
| (其它已允许项) | 与 ABI v2 allowlist 一致;不得扩展任意 HostFn |
|
||||
|
||||
---
|
||||
|
||||
## 6. 作者面(保持 · 不另起炉灶)
|
||||
|
||||
英文 `ext/web/web.mq.md` / 中文 `ext/web/网页.mq.md` 现有 `#` 类与 `##` 方法 **保持**:
|
||||
|
||||
| 类 | 职责 |
|
||||
|----|------|
|
||||
| `# page` / `# 页面` | 装配、meta、head、images、paginate、render |
|
||||
| `# db` / `# 数据库` + `# txn` | CRUD、事务、migrate/FTS(SQLite) |
|
||||
| `# form` / `# 表单` | 字段、规则、校验、渲染、提交 |
|
||||
| `# app` / `# 应用` | route、configure、listen、auth、gate、upload… |
|
||||
| `# auth` / `# 鉴权` | login/check/logout/hash |
|
||||
| `# cache` / `# 缓存` | memory/redis |
|
||||
| `# storage` / `# 存储` | file/s3 |
|
||||
| `# media` / `# 媒体` | validate/save |
|
||||
| `# ws` / `# 实时` | connect |
|
||||
| 模块函数 | `ensure_plugin`、`make_style`、`make_head`、`make_images`、`client_embed`、`text_patch`、`dom_patch`、`list_html` |
|
||||
|
||||
**重写默认策略**:先 **只换原生 `.so`**,L1 不动;仅当 §7 G 增强需要新方法时,再 **追加**(不破坏旧方法)。
|
||||
|
||||
---
|
||||
|
||||
## 7. G 增强(完备网页制备 + anlian;兼容之上增量)
|
||||
|
||||
> 以下为 **新增能力**,不替代 §5。作者面用新方法/新 configure 键;旧脚本不受影响。
|
||||
|
||||
| ID | 能力 | 动机 | 作者面草案 |
|
||||
|----|------|------|------------|
|
||||
| **G-WS1** | **命名房间** WS:`join`/`leave`/`publish`;组名 ASCII(如 `chat.room.{id}`) | anlian 公聊/私聊 | `app.route_ws` 增 `mode=room` + `room_key`;或 `ws.room_*` ABI |
|
||||
| **G-WS2** | 房间消息钩子:先 `invoke`/落库再广播 | 「先写 PG 再推送」 | configure 或 route 表 `on_message=lib.member` |
|
||||
| **G-SESS1** | Session 后端可选 `redis://` | 多进程/多实例 | `web_session_new` url 或 auth 配置 `session=redis://` |
|
||||
| **G-CACHE1** | Redis pub/sub 可选作 WS 扇出后端 | 多进程 WS | `configure ws_backend=redis` |
|
||||
| **G-API1** | Bearer API Key 校验原语(hash+pepper+scopes) | anlian `apikeys` | `web_api_key_check` + `# auth` 或独立小类;**业务 scopes 仍在 .mq.md** |
|
||||
| **G-MAIL0** | (可选后续)SMTP 发送原语 | 邮箱验证码 | 不阻塞首版对等;列入 anlian 二期 |
|
||||
|
||||
**明确仍属应用层(不进插件)**:反垃圾策略、草稿定时发布约定、好友关系、专题 `topic_bundles` 静态交互内容(静态挂载 + 前端 Marqdo/既有 JS 资产)。
|
||||
|
||||
---
|
||||
|
||||
## 8. 暗恋见君验收矩阵(检测「能不能写完」)
|
||||
|
||||
外部依赖(允许):**PostgreSQL**、**Redis**;可选对象存储。
|
||||
|
||||
| 模块 | Marqdo 后端 | Marqdo 前端 | 插件依赖 | 验收 |
|
||||
|------|-------------|-------------|----------|------|
|
||||
| 站点壳 / 首页 | `# page` + db | 局部刷新可选 WASM | listen、static、cache | 首页可开 |
|
||||
| posts 帖子/评论/板块 | route + form + db | 发帖表单 WASM 可选 | CRUD、CSRF、upload | CRUD+列表详情 |
|
||||
| news | 同上 | 同上 | 同上 | 列表详情 |
|
||||
| accounts | auth + session +(二期 mail) | 登录表单 | argon2、session、gate | 注册登录 |
|
||||
| profiles | db + storage | 头像上传 | storage/upload | 资料页 |
|
||||
| search | db.search 或 PG 查询 + cache | — | db/cache | 关键词搜索 |
|
||||
| chat | route_ws + G-WS1/2 + db | WS 客户端脚本 | Redis + WS rooms | 公聊+私聊实时 |
|
||||
| apikeys | G-API1 + db | 管理页 | — | Bearer 调 API |
|
||||
| webmaster | sitemap/robots | — | 已有 ABI | `/sitemap.xml` |
|
||||
| topics | `app.static` → bundles | 既有静态交互 | static | 专题可访问 |
|
||||
|
||||
**「写完」定义**:上述模块在 Marqdo 仓库或 `anlian` 旁路目录有可运行 `.mq.md` 站点;gold/手工脚本能走通主路径;不依赖 Django/Channels/Daphne/gunicorn。
|
||||
|
||||
---
|
||||
|
||||
## 9. 仓库布局与构建
|
||||
|
||||
### 9.1 目录(目标)
|
||||
|
||||
```text
|
||||
plugins/web/ # Go module(替换原 Rust crate)
|
||||
go.mod
|
||||
go.sum
|
||||
README.md
|
||||
abi/
|
||||
marqdo_abi.h # 从 include/ 拷贝或 cgo 引用
|
||||
bridge.go # //export marqdo_plugin_* ;register;alloc/free
|
||||
internal/
|
||||
page/ compose/ render/ form/
|
||||
db/ # sqlite + postgres driver
|
||||
cache/ storage/ upload/
|
||||
session/ auth/ password/ ratelimit/
|
||||
httpx/ # listen、router、middleware、admin、proxy、invoke
|
||||
ws/ # hub、rooms、client connect
|
||||
assets/ rss/ sitemap/ markdown/
|
||||
table/ # GFM 表 JSON 形态辅助
|
||||
cmd/ # 可选:非 c-shared 的本地自测
|
||||
scripts/build-web-plugin.sh # go build -buildmode=c-shared -o …/libweb.so
|
||||
```
|
||||
|
||||
原 Rust 源码:`plugins/web-rust-archive/`(**已移出 Cargo workspace**;参考用,默认不构建)。
|
||||
|
||||
### 9.2 产物与解析
|
||||
|
||||
| 平台 | 文件名 |
|
||||
|------|--------|
|
||||
| Linux | `libweb.so` |
|
||||
| macOS | `libweb.dylib` |
|
||||
| Windows | `web.dll` |
|
||||
|
||||
解析顺序仍走 `installed_native_path` / `MARQDO_WEB_PLUGIN`;`find_native_plugin` 增加查找:
|
||||
|
||||
- `plugins/web/build/libweb.so`(Go 构建输出)
|
||||
- `target/{debug,release}/libweb.so`(兼容旧路径,可选 copy)
|
||||
|
||||
### 9.3 宿主 / CI 变更要点
|
||||
|
||||
| 组件 | 变更 |
|
||||
|------|------|
|
||||
| 根 `Cargo.toml` workspace | 移除 `plugins/web` / `web-rust-archive` Rust member |
|
||||
| `tests/gold.rs` | `ensure_web_plugin_built()` → `scripts/build-web-plugin.sh` |
|
||||
| `marqdo ext add web` | 构建回退:`scripts/build-web-plugin.sh`(Go);Release 仍下发预编译 native zip |
|
||||
| Release 脚本 | Go:`scripts/build-web-plugin.sh`;其它插件仍 `cargo build -p …` |
|
||||
| [ext-cli.md](ext-cli.md) / [ext-abi.md](ext-abi.md) | 注明 web 插件实现语言为 Go |
|
||||
|
||||
### 9.4 cgo / runtime 注意
|
||||
|
||||
- `marqdo_plugin_init` 内 `register_fn` 注册全部符号;保存 host `alloc`/`free`/`host_query`。
|
||||
- 长时间 `web_listen`:在独立 goroutine 跑 `http.Server`,ABI 调用阻塞至 shutdown 或按现语义阻塞(**对齐现 Rust:listen 阻塞当前插件调用**)。
|
||||
- 禁止在 FFI 回调里长时间持有阻碍 GC 的错误模式;JSON 尽快拷贝到 Go string。
|
||||
- Windows 导出需 `.def` 或 `//export` 完整三个符号。
|
||||
|
||||
---
|
||||
|
||||
## 10. 实现波次(按文档开发顺序)
|
||||
|
||||
| 波次 | 内容 | 退出条件 |
|
||||
|------|------|----------|
|
||||
| **W-G0** | 文档(本文)+ ADR + 目录骨架 + ABI bridge 能 `plugin.load` + `demo` 注册探测 | ✅ `tests/ext/web-go-abi-smoke.mq.md`;`web_go_ready` + `web_page_new`;`scripts/build-web-plugin.sh` → `libweb.so` |
|
||||
| **W-G1** | table 辅助 + `web_style` + page new/compose/render(无 listen) | ✅ `web-smoke` / `web-zh-smoke`(含 compose_form / app_new / app_route 袋) |
|
||||
| **W-G2** | SQLite db CRUD + where + txn + init | ✅ `web-db-w2-smoke` / `web-db-w6-smoke`(txn·migrate·FTS) |
|
||||
| **W-G3** | form + mount_form + CSRF 基础 | ✅ `web-form-smoke`(validate/submit/render;CSRF 字段已接,listen 侧硬化见 W-G4/G5) |
|
||||
| **W-G4** | `web_listen` + route + static + part + middleware + JSON API | ✅ offline:`web-route` / `web-static` / `web-middleware` / `web-part`;`web_listen` 已接线(live 随 W-G5+ hardening) |
|
||||
| **W-G5** | session/auth/password/rate limit/gate/admin | ✅ offline:`web-security` / `web-c0` / `web-c1`;login rate limit 包已就位(HTTP 接线随 listen hardening) |
|
||||
| **W-G6** | upload/download/gallery/ETag + assets W8 | ✅ `web-upload` / `web-assets` / `web-p3` |
|
||||
| **W-G7** | SEO RSS sitemap robots redirect error paginate markdown | ✅ `web-content` / `web-w7-*` |
|
||||
| **W-G8** | WS echo/broadcast + access_log | ✅ `web-ws-broadcast-*` |
|
||||
| **W-G9** | Postgres + Redis cache + file/S3 storage | ✅ `web-drivers-smoke` |
|
||||
| **W-G10** | proxy + invoke + nested plugin | ✅ `web-proxy-invoke` / hosting live |
|
||||
| **W-G11** | 定制 C2–C4 shell/layout/style/nav | ✅ `web-c2`–`c4` |
|
||||
| **W-G12** | G 增强 WS rooms + Redis session/pubsub + API key 原语 | ✅ 单测 + `web-g12-api-key-smoke` |
|
||||
| **W-G13** | 默认切换 Go `libweb`;归档 Rust;更新发版与 ext CLI | ✅ 离线+live gold(7 个 `*_live`)对 Go 全绿;`ext add`/`gold`/`release` 走 `scripts/build-web-plugin.sh`;Rust 移出 workspace;gold 强制 `MARQDO_WEB_PLUGIN` 避免 `~/.marqdo` 旧 so |
|
||||
| **W-G14** | anlian Marqdo 重写主路径(可分仓或 `examples/anlian-mq/`) | ✅ `examples/anlian-mq/`(本地 SQLite + 粉玻璃主题 + 主路由/登录/片段;外接 PG/Redis 仍为增强路径) |
|
||||
|
||||
每波次:**先补 Go 实现 → 跑对应 gold → 再进入下一波**。禁止跨波次留下「注册了但返回 stub 错误」的 ABI(除 W-G0 明确的未实现探测)。
|
||||
|
||||
---
|
||||
|
||||
## 11. 测试策略
|
||||
|
||||
| 类型 | 做法 |
|
||||
|------|------|
|
||||
| 单元 | Go `go test ./internal/...`(db where、form rules、middleware) |
|
||||
| 金样例 | 现有 `tests/ext/web-*.mq.md`;构建脚本产出 `libweb.so` 后跑 |
|
||||
| Live | 现有 `*-live-server.mq.md` + curl |
|
||||
| 回归门禁 | CI:安装 Go → `scripts/build-web-plugin.sh` → `cargo test` 相关 web 项 |
|
||||
| anlian | 独立 smoke:登录、发帖、WS 发言、API key |
|
||||
|
||||
---
|
||||
|
||||
## 12. 风险与缓解
|
||||
|
||||
| 风险 | 缓解 |
|
||||
|------|------|
|
||||
| cgo/共享库与宿主线程 | 文档化;listen 独立 goroutine;shutdown 明确 |
|
||||
| JSON ABI 开销 | 热路径减少往返;装配结果缓存;不在此用「换语言」幻想消除 |
|
||||
| 行为微差异(HTML/Markdown) | 用同一批 gold HTML 片段断言;差异列 changelog |
|
||||
| 交叉编译 | 优先 `modernc.org/sqlite`;Release 矩阵 Linux/Windows 先 |
|
||||
| 双实现并存混乱 | W-G13 前用 `MARQDO_WEB_PLUGIN` 显式指向;文档写清默认 |
|
||||
|
||||
---
|
||||
|
||||
## 13. 文档与索引更新清单
|
||||
|
||||
实现推进时同步:
|
||||
|
||||
- [x] 本文状态行随波次更新
|
||||
- [x] [ext-abi.md](ext-abi.md) Demo/Web 节:实现语言 Go
|
||||
- [x] [ext-cli.md](ext-cli.md):构建回退含 `go build` / `scripts/build-web-plugin.sh`
|
||||
- [x] [ext-web.md](ext-web.md):链到本文;C5 落实说明
|
||||
- [ ] [web-asgi-servers-and-marqdo.md](web-asgi-servers-and-marqdo.md):axum → Go `net/http`
|
||||
- [ ] [doc/README.md](../README.md) 索引行(若尚未链到本文)
|
||||
- [x] ADR:`doc/adr/0004-web-plugin-go.md`(Accepted)
|
||||
- [x] `plugins/web/README.md` 开发者构建说明
|
||||
|
||||
---
|
||||
|
||||
## 14. 决议摘要
|
||||
|
||||
1. **全量重写** `plugins/web` 为 Go,**不是**最小闭环。
|
||||
2. **既有网络拓展能力(§5)重写后必须仍可用**;作者面默认兼容。
|
||||
3. **PostgreSQL / Redis 外接** 为一等公民;Marqdo 承担应用前后端脚本。
|
||||
4. **暗恋见君** 为完备性验收,不是缩小插件范围的借口。
|
||||
5. **多语言 ABI 生态** 以本插件为样板(G7)。
|
||||
6. 开发严格按 **§10 波次** 推进;本文件为唯一施工图。
|
||||
@@ -0,0 +1,81 @@
|
||||
# `ext/web` 可配置 RBAC(角色 ⊥ 权限)
|
||||
|
||||
| | |
|
||||
|---|---|
|
||||
| 验收 | qdqc:门禁 `desk:access` + 评论权限;`tests/ext/web-rbac-*-smoke.mq.md` |
|
||||
| 状态 | **Accepted · 已落地核心**(gate permissions;`/_rbac/*` 管理台 **opt-in** `管理台=真`) |
|
||||
|
||||
---
|
||||
|
||||
## 0. 一句话
|
||||
|
||||
权限是原子能力(`resource:action`);角色是权限包;用户通过 `user_roles` 获得角色。门禁与业务都问 `can(user, permission)`。管理员可在后台新建角色、勾选权限、赋给用户——**禁止**只靠写死的 `role=admin|user` 字符串作为唯一模型(兼容期仍可读旧 `roles=` gate)。
|
||||
|
||||
---
|
||||
|
||||
## 1. 表结构(SQLite / Postgres 同构)
|
||||
|
||||
| 表 | 列 |
|
||||
|----|-----|
|
||||
| `web_permissions` | `code` PK, `resource`, `action`, `description` |
|
||||
| `web_roles` | `id` PK, `name` UNIQUE, `is_system` INT, `tenant_id` TEXT NULL |
|
||||
| `web_role_permissions` | `role_id`, `permission_code` PK(role_id, permission_code) |
|
||||
| `web_user_roles` | `user_id`, `role_id`, `tenant_id` TEXT NULL, PK(user_id, role_id, tenant_id) |
|
||||
| `web_users` | `id` PK, `username` UNIQUE, `password_hash`, `created_at` |
|
||||
|
||||
命名带 `web_` 前缀,避免与业务表冲突。站点也可映射自定义表名(后期);首版固定。
|
||||
|
||||
---
|
||||
|
||||
## 2. 权限码约定
|
||||
|
||||
形如 `comments:create`、`desk:access`、`roles:manage`。内置种子见 `DefaultCatalog`。`*` 或角色名 `superadmin` / 兼容 `admin`:登录时展开为目录全集。
|
||||
|
||||
---
|
||||
|
||||
## 3. 作者 API
|
||||
|
||||
```markdown
|
||||
**`应用` = > `应用`.权限 确保结构=真 目录=`权限目录`**
|
||||
**`应用` = > `应用`.门禁 路径="/desk" 权限="desk:access" 匹配="prefix" 拒绝="redirect"**
|
||||
**`应用` = > `应用`.鉴权 用户表=`管理员` 注册=真 注册路径="/register" …**
|
||||
```
|
||||
|
||||
| 方法 | ABI | 说明 |
|
||||
|------|-----|------|
|
||||
| `app.rbac` / `启用权限` | `web_app_rbac` | ensure schema;可选 `目录`;`管理台=真` 才挂 `/_rbac/*` |
|
||||
| `app.gate` | `web_app_gate` | 新增 `permissions`/`权限`(CSV);与 `roles` 可并存:有 permissions 时按权限判定 |
|
||||
| `rbac.can` | `web_rbac_can` | `{ok, allowed}` |
|
||||
| `rbac.assign_role` | `web_rbac_assign_role` | 用户←角色 |
|
||||
| `rbac.set_role_permissions` | `web_rbac_set_role_permissions` | 角色←权限列表 |
|
||||
|
||||
防提权:`set_role_permissions` / `assign_role` 在 HTTP 管理面检查操作者 `roles:manage` 且不能授予自身没有的 permission。
|
||||
|
||||
---
|
||||
|
||||
## 4. 运行时
|
||||
|
||||
1. `listen`:若 `auth.rbac=true` 或调用过 `app.rbac`,对 `db` URL `EnsureSchema` + 种子。
|
||||
2. 仅当 `auth.rbac_desk=true`(`启用权限 管理台=真`)时挂载 `/_rbac/*` API 与 desk。
|
||||
3. 登录成功:解析角色 → DB `user_roles` ∪ GFM 角色展开 → session `permissions`(CSV)+ 兼容 `role`。
|
||||
4. `withRBAC`:gate 含 `permissions` 则 `PermissionAllowed`;否则旧 `RoleAllowed`。
|
||||
5. 注册:`POST /register` 写入 `web_users`,默认赋 `member` 角色。
|
||||
|
||||
---
|
||||
|
||||
## 5. qdqc 映射
|
||||
|
||||
| 产品 | 权限码 |
|
||||
|------|--------|
|
||||
| 发评论 | `comments:create` |
|
||||
| 删任意评论 | `comments:delete` |
|
||||
| 进 desk | `desk:access` |
|
||||
| 管角色 | `roles:manage` |
|
||||
|
||||
首个 GFM `admin` 用户登录后视为 `superadmin`(全权限);DB 迁移后绑定 `superadmin` 角色。
|
||||
|
||||
---
|
||||
|
||||
## 6. 非目标(本切片)
|
||||
|
||||
对象级 ACL 全图、ABAC;租户列先可空,多租户波次再启用。
|
||||
@@ -0,0 +1,91 @@
|
||||
# ext/web:请求上下文与表单字段来源
|
||||
|
||||
| | |
|
||||
|---|---|
|
||||
| 状态 | **Accepted** |
|
||||
| 日期 | 2026-09-18 |
|
||||
| 相关 | [ext-web.md](ext-web.md) §5.5 · 对照 Django `request.user` / URL kwargs |
|
||||
| 动机 | 禁止扩展库按业务表名(如 `comments`)特判填字段;身份与路由键属于请求上下文 |
|
||||
|
||||
---
|
||||
|
||||
## 0. 原则
|
||||
|
||||
1. **扩展库提供机制,站点表达领域** — 不得出现 `if table == "comments"`。
|
||||
2. **身份只从 session 来,且服务端盖戳** — 客户端提交的 `author` 等不可信。
|
||||
3. **资源键从路由参数来** — 页面已在 `/post/{slug}` 时,表单继承该页 `params`,不解析 Referer 猜 slug。
|
||||
4. **非 `client` 来源的字段默认不渲染** — 服务端在校验前写入;若 POST 带同名键,一律覆盖丢弃。
|
||||
|
||||
---
|
||||
|
||||
## 1. 请求上下文(Request)
|
||||
|
||||
每次处理 HTTP 请求时,框架逻辑上持有:
|
||||
|
||||
| 键 | 含义 |
|
||||
|----|------|
|
||||
| `user` / `username` | 登录名;访客为空 |
|
||||
| `params` | 动态路由捕获(如 `{slug}`) |
|
||||
| `path` | 请求路径 |
|
||||
| `method` | GET / POST / … |
|
||||
| `query` | URL 查询(可选) |
|
||||
|
||||
与 Django 对应:`request.user`、`request.resolver_match.kwargs`、`request.path`。
|
||||
|
||||
页面渲染时已有 `page.params`(`injectParams`)。表单提交时通过隐藏字段 `_mq_params`(JSON)与 `_mq_return`(回跳路径)把**渲染该表单时的页上下文**带回 POST,避免依赖 Referer。
|
||||
|
||||
---
|
||||
|
||||
## 2. 字段表「来源」列
|
||||
|
||||
字段表增加可选列 `来源` / `source`(缺省 = `client`):
|
||||
|
||||
```markdown
|
||||
| 字段 | 标签 | 类型 | 必填 | 默认 | 来源 |
|
||||
|------|------|------|------|------|------|
|
||||
| body | 写下你的想法 | textarea | true | | client |
|
||||
| author | | | true | | session.username |
|
||||
| post_slug | | | true | | route.slug |
|
||||
| created_at | | | false | | now |
|
||||
```
|
||||
|
||||
| 来源值 | 含义 | 渲染 |
|
||||
|--------|------|------|
|
||||
| `client` / 空 | 用户填写 | 正常控件 |
|
||||
| `session.username` / `session.user` / `user` | 当前登录用户名 | 不渲染 |
|
||||
| `route.NAME` / `param.NAME` / `params.NAME` | `params[NAME]` | 不渲染 |
|
||||
| `now` / `utc.now` / `server.now` | UTC `YYYY-MM-DD HH:MM:SS` | 不渲染 |
|
||||
|
||||
`类型=hidden` 仍可显式使用;与 `来源≠client` 叠加时仍不依赖客户端值(服务端覆盖)。
|
||||
|
||||
---
|
||||
|
||||
## 3. 提交管线
|
||||
|
||||
```
|
||||
ParseForm → 去掉来源≠client 的 POST 键
|
||||
→ 按字段来源从 Request 写入
|
||||
→ validate → insert/update
|
||||
→ 回跳:优先 _mq_return(同站路径),否则 form.redirect
|
||||
```
|
||||
|
||||
伪造 `author` / `post_slug` 无效。
|
||||
|
||||
---
|
||||
|
||||
## 4. 页面列表装配(副绑定)
|
||||
|
||||
详情页可附加与主主体**不同查询条件**的列表绑定(如评论):
|
||||
|
||||
```markdown
|
||||
**post = > post.列表装配 主体=`评论卡片` 条件=`评论条件` 排序="-created_at"**
|
||||
```
|
||||
|
||||
条件值同样支持 `{slug}`。渲染在主文章/卡片区之后,无需为子资源单独写 JSON API + 前端过滤。
|
||||
|
||||
---
|
||||
|
||||
## 5. 非目标
|
||||
|
||||
- 不在扩展库内实现「评论」领域类型。
|
||||
- 不把 Referer 解析当作正式 params 来源(仅兼容期可作 `_mq_params` 缺失时的弱回退,金样不依赖)。
|
||||
@@ -0,0 +1,24 @@
|
||||
# Native SPA(Marqdo WASM 全页客户端)
|
||||
|
||||
| | |
|
||||
|---|---|
|
||||
| 状态 | **Accepted · MVP** |
|
||||
| 日期 | 2026-09-17 |
|
||||
| 相关 | [browser-marqdo-wasm.md](browser-marqdo-wasm.md) · route D/E |
|
||||
|
||||
## 约定
|
||||
|
||||
| 表 | 列 | 用途 |
|
||||
|----|-----|------|
|
||||
| 客户端路由 | `路径` / `面板` / `标题` | 文档化视图;运行时用 `path` + `set_attr(hidden)` 切换 |
|
||||
| 客户端状态 | `browser.store_set` / `store_get` `scope=memory` | 页内状态(列表 JSON、当前 id) |
|
||||
|
||||
作者零业务 JS:`web.client_embed` + `static/client.mq.md` + `lib/browser`。
|
||||
|
||||
## Bridge
|
||||
|
||||
`storage` effect 支持 `scope=memory`(进程内 `Map`),与 `local` / `session` / `cookie` 并列。
|
||||
|
||||
## Demo
|
||||
|
||||
`examples/web-spa-app/` — 列表 → 详情 → 编辑,全客户端路由。
|
||||
@@ -0,0 +1,23 @@
|
||||
# ext/web multi-tenant (path / subdomain / header)
|
||||
|
||||
| | |
|
||||
|---|---|
|
||||
| 状态 | **Accepted · MVP** |
|
||||
| 日期 | 2026-09-17 |
|
||||
| 相关 | [ext-web-rbac.md](ext-web-rbac.md) · full-ambition plan |
|
||||
|
||||
## Author API
|
||||
|
||||
```markdown
|
||||
**应用 = > `应用`.tenant mode="path" param="t" column="tenant_id" default_scope=False**
|
||||
```
|
||||
|
||||
JSON route table may set `tenant_scope` / `租户作用域` = true so `GET /api/items?t=acme` only returns rows with `tenant_id=acme`.
|
||||
|
||||
## Runtime
|
||||
|
||||
1. `withTenant` resolves id into request context.
|
||||
2. Scoped JSON selects `AND tenant_id=?`; missing tenant → 400.
|
||||
3. `default_scope=True` also stamps form POST bodies.
|
||||
|
||||
Demo: `examples/web-tenant-saas/`.
|
||||
@@ -3,8 +3,8 @@
|
||||
| | |
|
||||
|---|---|
|
||||
| 状态 | **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) |
|
||||
| 相关 | [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) |
|
||||
| 日期 | 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)** |
|
||||
| 安装(目标) | `marqdo ext add web`(中英:`web` / `网页`) |
|
||||
| 本文目的 | 锁定**作者面**与**类 API**;指导实现 |
|
||||
|
||||
@@ -45,7 +45,7 @@
|
||||
| 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 者)评审通过后**删除或清空后重写**;禁止在旧代码上打补丁演进 |
|
||||
| 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) |
|
||||
|
||||
@@ -247,6 +247,7 @@ import db:db/index.mq.md
|
||||
|------|------|
|
||||
| compose_components / 组件装配 | 解析组件·样式路径 → 填 nav/sidebar/footer → CSS → 登记 part |
|
||||
| compose_main / 主体装配 | 解析库字段与样式路径 → 填 main → 登记 part(如 id=`index`) |
|
||||
| compose_list / 列表装配 | 副绑定(独立 query/order);可选 target 注入引言元素;见 [ext-web-request-context.md](ext-web-request-context.md) |
|
||||
|
||||
**槽位推断:** 由组件导出名决定(`nav`→顶栏,`side`→侧栏,`foot`→底栏;其余→main)。
|
||||
|
||||
@@ -423,6 +424,7 @@ import db:db/index.mq.md
|
||||
| `类型` | 控件/值类型:`text` `textarea` `number` `email` `url` `checkbox` `select` … |
|
||||
| `必填` | 是否必填 |
|
||||
| `默认` | 可选默认值 |
|
||||
| `来源` / `source` | 可选;见 [ext-web-request-context.md](ext-web-request-context.md):`client`(默认)/ `session.username` / `route.NAME` / `now`;非 client 不渲染且服务端盖戳 |
|
||||
|
||||
#### 5.5.2 校验表(作者面)
|
||||
|
||||
@@ -541,7 +543,7 @@ submit → action=insert → db.insert;action=update → db.update
|
||||
|----|----|------|
|
||||
| Marqdo 核心 | 表→Value、类/方法、import | 不识别 web 路径语法 |
|
||||
| `ext/web/*.mq.md` | 作者 API、中英面、委托插件 | 不直接 `host_*` |
|
||||
| `plugins/web` | 路径解析辅助、装配结果、listen、SQL、渲染 | 不要求作者写袋 |
|
||||
| `plugins/web` | **Go** `libweb`(HTTP / SQL / HTML 壳;见 [ext-web-go-rewrite.md](ext-web-go-rewrite.md)) | 不要求作者写袋 |
|
||||
|
||||
**实现要点(评审通过后再做):**
|
||||
|
||||
@@ -580,7 +582,9 @@ submit → action=insert → db.insert;action=update → db.update
|
||||
## 9. 非本波次(可记入路线图)
|
||||
|
||||
- Postgres / Redis / S3 驱动细节(SQLite 已落地);
|
||||
- 复杂权限与多租户;
|
||||
- ~~复杂权限与多租户~~ → **可配置 RBAC** 见 [ext-web-rbac.md](ext-web-rbac.md);**多租户** 见 [ext-web-tenant.md](ext-web-tenant.md)(path/subdomain/header + `tenant_scope`);
|
||||
- ~~重客户端 SPA~~ → **Native SPA** 见 [ext-web-spa.md](ext-web-spa.md)(WASM + 路由表 + `store_set` memory);
|
||||
- ~~实时协同编辑~~ → **Collab MVP** 见 [ext-web-collab.md](ext-web-collab.md)(WS room LWW 文本 + presence);
|
||||
- 子页路由糖的更多约定(`# 应用.route` 已够用)。
|
||||
|
||||
---
|
||||
|
||||
@@ -0,0 +1,55 @@
|
||||
# 标准库 / 扩展库:代码即文档
|
||||
|
||||
| | |
|
||||
|---|---|
|
||||
| 状态 | **Active** |
|
||||
| 日期 | 2026-09-14 |
|
||||
| 相关 | [code-as-docs-gaps.md](code-as-docs-gaps.md) · [bracket-call-modifiers.md](bracket-call-modifiers.md) · [collection-access-link.md](collection-access-link.md) · [stdlib.md](stdlib.md) · [marqdo-dev skill](../../.cursor/skills/marqdo-dev/SKILL.md) · [roadmap](../roadmap/lib-ext-code-as-docs.md) |
|
||||
|
||||
---
|
||||
|
||||
## 1. 目标
|
||||
|
||||
`lib/*` 与 `ext/*` 的 `.mq.md` 应**可当说明书读、可当程序跑**。薄库不写长文;厚领域库(web / quantum / …)仍用叙述承载意图,但数据与调用面与用户程序同一套标记。
|
||||
|
||||
## 2. 薄库模板(默认)
|
||||
|
||||
每个导出函数 / 方法尽量按此骨架(中英分文件锁步):
|
||||
|
||||
1. **目的句**(一句人话,无标记即可)。
|
||||
2. **叙述形参**:正文里出现 `` `名` `` / `` `名`=默认 ``(推断签名);过渡期可保留 `` + `名` ``。
|
||||
3. **一例**:粗体或 `>` 调用;优先可读表面。
|
||||
4. **实现**:短;取元用 `[键](集合)`,**禁止新增**脚注取元 `` `m`[^k] ``(旧解析仍可用)。
|
||||
|
||||
调用示例(三种等价,试点期任选;新叙述优先括号标记或粗体):
|
||||
|
||||
```markdown
|
||||
**出 = [put] 入=`表` 键="a" 值=1**
|
||||
|
||||
**出 = put 入=`表` 键="a" 值=1**
|
||||
|
||||
> put 入=`表` 键="a" 值=1
|
||||
```
|
||||
|
||||
带布尔开关时可用前置修饰:`严格 [parse] text=`源`` → `严格=True`(形参名与修饰语字面一致;核心不剥「的」等词缀)。
|
||||
|
||||
## 3. 硬约束
|
||||
|
||||
| 要 | 不要 |
|
||||
|----|------|
|
||||
| GFM 表作数据;`table.put` / 具名助手 | `json.set` 链当字典构造器 |
|
||||
| 作者程序用 `[k](c)` 取元;`- [项](集合)` foreach | 新代码写 `` m[^k] `` |
|
||||
| 中英 API 对称(见 [stdlib-i18n.md](stdlib-i18n.md)) | 只改一侧 |
|
||||
| 一例跑通即文档(public/stdlib 或 examples) | 另开第二套「文档站」手写说明 |
|
||||
|
||||
**库函数体内的叙述坑:** 函数体里的链接形 `[k](c)`、以及单独的 `**强调**` 会被当成可执行代码。库内说明用「链接取元 / link-index」等字面描述;可执行示例放在 `public/stdlib` 或 `examples/`,不要写在 `##` 体内当叙述。
|
||||
|
||||
## 4. 波次
|
||||
|
||||
见 [roadmap/lib-ext-code-as-docs.md](../roadmap/lib-ext-code-as-docs.md):先稳定调用表面,再 M1 试点 table/text/json,其后批次 lib → ext。
|
||||
|
||||
## 5. 修订历史
|
||||
|
||||
| 日期 | 说明 |
|
||||
|------|------|
|
||||
| 2026-09-14 | 初稿(随括号调用落地) |
|
||||
@@ -0,0 +1,618 @@
|
||||
# Marqdo 语法映射 v0.3(叙述统一 · 粗体即代码)
|
||||
|
||||
| | |
|
||||
|---|---|
|
||||
| 状态 | **Accepted · 现行运行时目标(实现中)** |
|
||||
| 日期 | 2026-09-13 |
|
||||
| 取代 | [markdown-mapping.md](markdown-mapping.md) **v0.2(已废止为运行时宪法)** |
|
||||
| ADR | [0005-prose-unified-markup.md](../adr/0005-prose-unified-markup.md) |
|
||||
| 路线 | [markup-v0.3.md](../roadmap/markup-v0.3.md) |
|
||||
| 相关 | [code-vs-comment.md](code-vs-comment.md) · [return-hr-and-code-surface.md](return-hr-and-code-surface.md) · [call-arguments.md](call-arguments.md) · [objects.md](objects.md) · [keywords.md](keywords.md) |
|
||||
|
||||
> **名词:** 本文「Markup」指 Marqdo **如何把 Markdown 标记映射成语法**(`**` 代码、`*` 返回、`` `名` `` 声明),不是另一个语言。产品仍是 Marqdo。
|
||||
> **v0.3 为唯一映射。** 不做 v0.2 双模式 / `--markup` 版本身份。摸索阶段允许破坏性变更;旧 `.mq.md`(`*语句*` / `**返回**`)须改写。金样例见 `tests/markup-v03/`。
|
||||
|
||||
---
|
||||
|
||||
## 0. 一句话
|
||||
|
||||
让 **Markdown 叙述本身成为程序的一部分**:普通文字里用 `` `名` `` 出现变量(首次未赋值 = 声明);用 **`**…**` 粗体** 包裹可执行代码(含调用,不必再写 `>`);用 **`*…*` 斜体** 表示返回值。函数形参**不再手写 `+` 列表**,由函数体内的声明/赋值自行推断。
|
||||
|
||||
---
|
||||
|
||||
## 1. 动机(为何推翻 v0.2 的部分定论)
|
||||
|
||||
v0.2 为了「标记即语法」的清晰边界,做了这些硬隔离:
|
||||
|
||||
| v0.2 | 代价 |
|
||||
|------|------|
|
||||
| 无标记行 = 纯注释;变量只能写在 `*…*` / 结构行里 | 叙述与代码割裂,「文档即代码」读起来像两套语言叠在一起 |
|
||||
| `*…*` = 语句,`**…**` = 返回 | 与常见 Markdown/AI 习惯相反:模型更爱用 `**` 强调「要执行的东西」,读者也更易看见粗体 |
|
||||
| 调用必须 `>` | 行间调用要另起结构行,叙述中夹调用不自然 |
|
||||
| 形参必须 `` + `名` `` | 仪式感强;函数头像「另一套签名语言」,与正文脱节 |
|
||||
|
||||
古早示例(当时不能跑,正是本文要合法化的目标面):
|
||||
|
||||
```markdown
|
||||
## 加一函数
|
||||
|
||||
对于输入变量`n`,我们执行操作**n=n+1**接着返回*n*。
|
||||
|
||||
# main
|
||||
|
||||
我要调用加一函数可以采用这样的办法:
|
||||
|
||||
> 加一函数 37
|
||||
|
||||
或者可以直接这么调用**加一函数 37**
|
||||
```
|
||||
|
||||
目标:上述文件在 v0.3 下应能解析、求值,且**读起来仍是一篇正常中文说明**。
|
||||
|
||||
---
|
||||
|
||||
## 2. 哲学(设计原则)
|
||||
|
||||
### P1 — 叙述统一(Prose-unified)
|
||||
|
||||
- Marqdo 注释采用 **Markdown 叙述**(段落、列表中的说明文字),不是第二种注释语法。
|
||||
- **变量可以出现在正常文字之间**:用 Markdown 行内代码 `` `n` `` 标识标识符。
|
||||
- **第一次出现且未赋值 = 声明变量**;之后的出现 = 引用。赋值发生在粗体代码段内(或兼容的结构赋值形)。
|
||||
- **未使用的变量无害**(不报错、不升参);真正的输入由「可执行面读取」升为形参(§8)。
|
||||
- 这样「说明文字」与「程序名字」共用同一套 Markdown 视觉习惯,整体更和谐。
|
||||
|
||||
### P2 — 粗体即代码(Bold-as-code)
|
||||
|
||||
- **`**…**` = 代码段**(可执行):赋值、表达式、函数/方法调用、可内联的短语句。
|
||||
- 选择粗体的原因:
|
||||
1. **AI 输出偏好**:模型天然爱用 `**` 强调「重要操作」;把粗体定为可执行,降低「模型写了强调却被当成返回」的错配。
|
||||
2. **行间显眼**:在长段落里,粗体比斜体更容易被扫到。
|
||||
- 粗体代码段内的调用 **允许不写 `>`**:`**加一函数 37**` 与 `> 加一函数 37` 语义等价(见 §6)。
|
||||
- **`>` 保留为可选调用面**(blockquote 风格、独立行、兼容 v0.2 迁移与 AI 已学会的形态)。
|
||||
|
||||
### P3 — 斜体即返回(Italic-as-return)
|
||||
|
||||
- **`*…*` = 返回值**(架构级),与粗体代码形成对立、易读的一对:
|
||||
- 做了什么 → 粗体
|
||||
- 结果是什么 → 斜体
|
||||
- **空返回 / 无值收束**(已决议,见 §7.2):推荐 `*None*` / `*无*`;整行 `**`;兼容 `****`。`---` / `***` 仅为叙述分隔(跳过),**不再**结束函数体。
|
||||
- **输出仍不是返回**:打印继续用内置 `print` / `打印`(副作用函数),不把粗体或斜体当成「打印到终端」的语法。
|
||||
|
||||
### P4 — 形参由体推断(Body-inferred params)
|
||||
|
||||
- **不再要求**作者手写 `` + `名` `` 形参表(v0.3 默认关闭;过渡期可兼容,见 §8)。
|
||||
- 函数体内:
|
||||
- **只声明、未赋默认** → **必选形参**(调用时必须提供)。
|
||||
- **声明同时赋值**(含默认值字面量)→ **可选形参**(带默认值)。
|
||||
- 推断顺序与绑定规则见 §8;与位置/具名实参规则对齐 [call-arguments.md](call-arguments.md) 的精神(可修订附录)。
|
||||
|
||||
### P5 — 标记仍承载控制流(不变)
|
||||
|
||||
- **不引入** `if` / `else` / `while` / `for` / `def` / `return` 关键字。
|
||||
- `#` = 对象/类型,`##`+ = 函数/方法([objects.md](objects.md) 不变)。
|
||||
- 分支仍用 `1.` `2.` …;循环仍用 `-`;结构行不必再包粗体(见 §5)。
|
||||
|
||||
### P6 — 其它「代码即文档」补强(本版一并采纳)
|
||||
|
||||
| 思路 | 说明 |
|
||||
|------|------|
|
||||
| **渐进披露** | 读者可只读叙述;运行时只执行标记与推断出的声明。同一文件服务人与机器。 |
|
||||
| **最小仪式** | 能从正文看出的签名,就不在函数头重复写一遍。 |
|
||||
| **双调用面** | 独立行 `>` 适合「步骤清单」;行间 `**f …**` 适合「嵌在句子里的动作」。 |
|
||||
| **标识符视觉统一** | 叙述、代码、形参一律优先 `` `名` ``;粗体/斜体内部允许裸名(与 v0.2 斜体/粗体内规则同类)。 |
|
||||
| **段落仍可整段注释** | 不含任何可执行标记、且无「声明性 `` `名` ``」义务的纯说明段,行为与注释相同(见 §4 消歧)。 |
|
||||
| **迁移可观测** | `--dump-lines` / `--dump-ast` 必须能区分「叙述中的声明」与「粗体代码」与「斜体返回」。 |
|
||||
|
||||
---
|
||||
|
||||
## 3. 与 v0.2 对照(角色对调摘要)
|
||||
|
||||
| 概念 | v0.2 | v0.3 |
|
||||
|------|------|------|
|
||||
| 程序语句 / 代码段 | `*…*` | `**…**` |
|
||||
| 返回值 | `**…**` | `*…*` |
|
||||
| 独立调用 | 必须 `>` | `>` **或** `**callee …**` |
|
||||
| 形参 | 标题下 `` + `名` `` | **体推断**(`+` 过渡兼容) |
|
||||
| 叙述中的变量 | 一般为注释,不可声明 | `` `名` `` 可声明/引用 |
|
||||
| 无标记纯文字 | 成段注释 | 仍为叙述;**若含声明性反引号则参与绑定图**(见 §4) |
|
||||
|
||||
这是一次 **架构级标记对调**,不是局部糖。金样例、教程、Skill、扩展库需按路线图分波迁移。
|
||||
|
||||
---
|
||||
|
||||
## 4. 叙述、声明与注释
|
||||
|
||||
### 4.1 三层模型(修订)
|
||||
|
||||
| 层 | 形态 | 角色 |
|
||||
|----|------|------|
|
||||
| **叙述面** | 普通 Markdown 段落、列表说明 | 给人读;其中的 `` `名` `` 可进入**绑定图** |
|
||||
| **可执行面** | 结构标记(`#` `>` `+` `-` `1.` 表…)+ **`**代码**`** + **`*返回*`** | 求值 |
|
||||
| **外联面** | ` ```lang ` | FFI(不变) |
|
||||
|
||||
### 4.2 变量在叙述中的出现
|
||||
|
||||
语法:Markdown **行内代码** `` `标识符` ``。
|
||||
|
||||
| 出现形态 | 语义 |
|
||||
|----------|------|
|
||||
| 全文(当前函数/对象作用域)**首次**出现 `` `n` ``,且此前/同句无对 `n` 的赋值 | **声明变量**(进入绑定图;是否升为形参见 §8) |
|
||||
| 已声明之后再次 `` `n` `` | **引用**(不生成新绑定) |
|
||||
| 粗体内 `**n = …**` / `**n=n+1**` | **赋值**(若首次赋值且未见声明,则声明+赋值一并发生) |
|
||||
| 叙述中 `` `n`=1 ``(反引号名紧贴 `=`,无粗体) | **带初值的声明**(形参默认或局部初值;见 §8) |
|
||||
|
||||
推荐作者写法(与动机示例一致):
|
||||
|
||||
```markdown
|
||||
对于输入变量`n`,我们执行操作**n=n+1**接着返回*n*。
|
||||
```
|
||||
|
||||
- `` `n` `` → 声明变量;因随后在代码中**读取**未先由局部独力定义 → 升为必选形参(§8)
|
||||
- `**n=n+1**` → 代码段(赋值)
|
||||
- `*n*` → 返回
|
||||
|
||||
### 4.3 何为「纯注释」
|
||||
|
||||
满足下列**全部**条件的段落,不产生绑定、不求值:
|
||||
|
||||
1. 不含结构标记行;
|
||||
2. 不含 `**…**` / 作为返回的 `*…*`(见 §7);
|
||||
3. 不含任何 `` `标识符` ``。
|
||||
|
||||
仍建议:**叙述段与独立结构代码行之间空一行**,降低人读与差分时的视觉粘连(解析器在 v0.3 下不再依赖「空行分段注释升级」作为唯一边界,但空行仍是作者卫生习惯)。
|
||||
|
||||
### 4.4 提及性反引号:一律视作变量(已决议)
|
||||
|
||||
**不另设「仅提及、不声明」语法。** 叙述里凡出现合法标识符 code span `` `名` ``,一律按 **变量** 处理(首次 = 声明,其后 = 引用)。
|
||||
|
||||
| 情况 | 处理 |
|
||||
|------|------|
|
||||
| 谈到某名但可执行代码**从未读写**它 | 仍是绑定图中的变量;**对求值无影响**(死绑定) |
|
||||
| 与其它语言对照 | 类似 Python 写了未用局部、JS 未用 `let`——默认可忽略;实现可对「从未读写」发**可选 lint**,**不得**因此报错或拒绝运行 |
|
||||
| 是否变成函数形参 | **否**(仅声明、从未在可执行面被读取)——见 §8.2「升参条件」 |
|
||||
| 是否需要 `` 提及`n` `` 等前缀 | **不需要**;避免第二套反引号方言 |
|
||||
|
||||
例(合法、无副作用):
|
||||
|
||||
```markdown
|
||||
## 说明性函数
|
||||
|
||||
本文顺便提到`Markdown`与`GFM`,但真正的输入只有`题干`。
|
||||
**print text=题干**
|
||||
---
|
||||
```
|
||||
|
||||
- `` `Markdown` `` / `` `GFM` `` → 变量声明,未使用 → 不进形参表、不改行为
|
||||
- `` `题干` `` → 声明且在粗体中读取 → 必选形参
|
||||
|
||||
**否决**:为「提及」单独做转义/前缀(曾列于开放点);若将来作者强烈需要「叙述中的等宽字但不进绑定图」,另开增强案,不阻塞 v0.3 核心。
|
||||
|
||||
### 4.5 成段规则相对 v0.2 的变化
|
||||
|
||||
v0.2:「段首无标记 → 整段注释,续行永不升级」。
|
||||
v0.3:
|
||||
|
||||
- 叙述段落**可以**内含可执行粗体/斜体返回;解析器做**段内扫描**,抽出 `` `名` ``、`**…**`、`*…*`。
|
||||
- 独立结构行(行首 `#` `>` `-` `1.` `|` 等)仍整行分类为代码。
|
||||
- **否决维持**:「整行无标记 = 默认可执行代码」。无标记且无反引号声明的文字永不单独变成语句。
|
||||
|
||||
---
|
||||
|
||||
## 5. 映射总表(v0.3)
|
||||
|
||||
| 标记 | 语义 |
|
||||
|------|------|
|
||||
| `#` … `######` | `#` = 对象/类型;`##`+ = 函数/方法(同 [objects.md](objects.md)) |
|
||||
| 叙述中 `` `名` `` | 声明或引用(§4) |
|
||||
| `**…**` | **代码段**(赋值、表达式、调用) |
|
||||
| `*…*` | **返回值**(含显式空值,见 §7.2) |
|
||||
| `>` 行 | **调用**(可选面,与粗体内调用等价) |
|
||||
| `` + `名` `` | **过渡兼容**:显式形参;新代码不推荐 |
|
||||
| 体内 `1.` `2.` … | 分支 |
|
||||
| 体内 `-` | 循环 |
|
||||
| `N. *` | else 臂(此处 `*` 仍是「空条件」标记,**不是**返回值;见 §7.3) |
|
||||
| GFM 表格 | 集合;`` `名` = `` 后绑定,或**未绑定**时求值后丢弃(文档中可写表) |
|
||||
| 表达式 `[键](集合)` | **取元**(与 foreach 同形;见 [collection-access-link.md](collection-access-link.md)) |
|
||||
| `修饰… [函数名] 实参…` | **方括号标记调用**(前置修饰 → `名=True`;见 [bracket-call-modifiers.md](bracket-call-modifiers.md)) |
|
||||
| `` 集合[^键] `` | **过渡**:旧脚注取元(仍可用) |
|
||||
| ` ```lang ` | 外联(不变) |
|
||||
| 单独一行 `---` / `***` | **叙述分隔**(跳过;模块顶与函数体内相同) |
|
||||
| 整行恰 `**` 或 `****` / `*None*` / `*无*` | **空返回**并结束本函数体(见 §7.2) |
|
||||
|
||||
### 结构行与粗体
|
||||
|
||||
行首已是结构标记的构造(`#` `>` `+` `-` `|`、`1.`)**不必**再包 `**…**`。
|
||||
粗体用于:**嵌在叙述中的代码**,以及「我想把这一小段标成可执行」的行间片段。
|
||||
|
||||
---
|
||||
|
||||
## 6. 调用
|
||||
|
||||
### 6.1 调用表面
|
||||
|
||||
```markdown
|
||||
> 加一函数 37
|
||||
|
||||
**加一函数 37**
|
||||
|
||||
礼貌 [问候] marqdo
|
||||
```
|
||||
|
||||
前两种解析为对 `加一函数` 的调用;第三种为**方括号标记调用**(`[` `]` 标出函数名,前置裸词展开为 `名=True`)。实参位置或具名绑定;详见 [call-arguments.md](call-arguments.md) · [bracket-call-modifiers.md](bracket-call-modifiers.md)。
|
||||
|
||||
| 形式 | 典型用途 |
|
||||
|------|----------|
|
||||
| `> …` | 步骤列表、独立可执行行、与 v0.2/AI 习惯兼容 |
|
||||
| `**…**` | 嵌在句子中:「或者可以直接这么调用**加一函数 37**」 |
|
||||
| `**x = 加一 37**` | 粗体赋值右侧为调用时**可省略 `>`**(代码即文档首选;`> 加一 37` 仍合法) |
|
||||
| `修饰… [函数] 实参…` | 叙述里需要「形容词 + 动词」时消歧;与 `[键](集合)` 取元靠 `]` 后是否紧邻 `(` 区分 |
|
||||
|
||||
### 6.2 粗体内调用的判别
|
||||
|
||||
粗体内容在去掉外层 `**` 后,按下列优先级分类:
|
||||
|
||||
1. 含 `=` 且左侧为可赋值目标(标识符 / 脚注左值等)→ **赋值语句**(可含右侧调用)。
|
||||
2. 否则,若首词为已知函数/方法/内置/导入成员(Pass 名表可见)→ **调用**。
|
||||
3. 否则 → **表达式语句**(求值后丢弃,或在语句位置非法则诊断)。
|
||||
|
||||
示例:
|
||||
|
||||
| 粗体内容 | 分类 |
|
||||
|----------|------|
|
||||
| `n=n+1` | 赋值 |
|
||||
| `加一函数 37` | 调用 |
|
||||
| `加一函数 n=37` | 调用(具名) |
|
||||
| `n + 1` | 表达式(单独出现时;作返回应写 `*n + 1*`) |
|
||||
| `print text=hi` / `打印 内容=你好` | 调用(内置) |
|
||||
|
||||
### 6.3 方法调用
|
||||
|
||||
- 独立行:`` > `对象`.方法 … ``(兼容)或 `> 对象.方法 …`(若接收者规则允许)。
|
||||
- 粗体内:`**对象.方法 …**` / `**p = page.主体装配 组件=home**`。
|
||||
- 粗体/斜体内裸名 = 变量(延续 v0.2「段内统一命名空间」精神)。
|
||||
|
||||
### 6.4 实参
|
||||
|
||||
具名 + 位置混用规则继承 [call-arguments.md](call-arguments.md);v0.3 仅把「形参列表来源」从 `+` 行改为**推断签名**(§8)。独立 `>` 行上裸词仍为文本字面量;粗体内调用的裸词为变量(与 v0.2「段内调用」一致)。
|
||||
|
||||
---
|
||||
|
||||
## 7. 返回
|
||||
|
||||
### 7.1 斜体返回
|
||||
|
||||
```markdown
|
||||
*n*
|
||||
*n + 1*
|
||||
*"ok"*
|
||||
```
|
||||
|
||||
斜体内部值语法与 v0.2 粗体返回内部相同(裸词 = 变量;文本须引号)。
|
||||
|
||||
### 7.2 空返回与收束(已决议)
|
||||
|
||||
Marqdo **不引入** `return` 关键字;「无值结束」用标记表达。对照常见语言:
|
||||
|
||||
| 语言 | 无值 / 空返回 | Marqdo v0.3 对应 |
|
||||
|------|----------------|------------------|
|
||||
| Python | `return` / `return None` | 显式 `*None*`·`*无*` |
|
||||
| Go | 无结果函数里的 `return` | `*None*` / 整行 `**` / `****` |
|
||||
| Rust | `()` 或函数末尾隐式 unit | 同上;或下一标题 / EOF 自然结束 |
|
||||
| JavaScript | `return;` → `undefined` | 同上 → 运行时 `None` |
|
||||
| Marqdo 历史 | `---` 收束;`****` | `---` 已改为叙述跳过;`****` 仍兼容 |
|
||||
|
||||
#### 形式层级(推荐自上而下)
|
||||
|
||||
| 优先级 | 形式 | 语义 | 说明 |
|
||||
|--------|------|------|------|
|
||||
| **1. 显式空值** | `*None*` 或 `*无*`(整段或行内返回位) | 返回 `None` **并结束本函数体解析** | 对齐 Python `return None`;副作用函数首选;外层续写依赖此收束 |
|
||||
| **2. 空斜体标记** | **整行** trim 后恰为两个星号:`**` | 同上 | 词法钉死:`^\s*\*\*\s*$` → **空斜体返回**,**不得**当成粗体开闭 |
|
||||
| **3. 兼容** | 整行 `****`(四个星号) | 同空返回 | 迁移期识别 |
|
||||
| **(非收束)** | 整行 `---` / `***` | **仅叙述分隔**,跳过 | 不再结束函数;见 [code-as-docs-gaps.md](code-as-docs-gaps.md) |
|
||||
|
||||
```markdown
|
||||
## 只打印
|
||||
**print text=hi**
|
||||
*None*
|
||||
|
||||
## 空斜体行
|
||||
**print text=hi**
|
||||
**
|
||||
|
||||
## 分割线不收束(下一标题才结束)
|
||||
**print text=hi**
|
||||
---
|
||||
```
|
||||
|
||||
#### 词法消歧(空斜体 vs 粗体)
|
||||
|
||||
1. **整行恰好 `**`(两个 `*`)** → 空返回(规则 2),不是未闭合粗体。
|
||||
2. **粗体代码**至少包住一个非空内容:`**x**`、`**n=1**`;不允许「空粗体代码段」作为语句。
|
||||
3. **四个星号整行 `****`** → 兼容空返回(规则 3),不解释为「空粗体代码」。
|
||||
4. 行内出现的 `**…**`(两侧还有叙述文字)按正常粗体代码扫描,不走「整行空返回」。
|
||||
|
||||
#### 与「有返回值」的关系
|
||||
|
||||
- 需要把值交回调用方 → 用非空斜体:`*n*`、`*n + 1*`(返回即结束本函数体解析)。
|
||||
- 只做副作用、不要值 → 优先 `*None*` / `*无*` / 整行 `**`。
|
||||
- 下一标题或 EOF 也可结束体;**不要**再靠 `---` 收束。
|
||||
|
||||
### 7.3 与 else 臂 `N. *` 的消歧
|
||||
|
||||
有序列表臂头 `2. *` 中的 `*` 表示 **else**,不是返回。判别:行匹配 `^\s*\d+\.\s+\*\s*$`(可带尾注)→ 分支 else;不进入返回扫描。
|
||||
|
||||
### 7.4 输出
|
||||
|
||||
```markdown
|
||||
**print text=Hello**
|
||||
> print text=Hello
|
||||
```
|
||||
|
||||
打印是调用,不是返回。禁止把 `*Hello*` / `**Hello**` 解释为「打印 Hello」(延续 v0.2 决议精神,仅对调标记)。
|
||||
|
||||
---
|
||||
|
||||
## 8. 形参推断
|
||||
|
||||
### 8.1 目标签名
|
||||
|
||||
对每个 `## 函数`(及方法),在 Pass1 收集体之后得到:
|
||||
|
||||
```text
|
||||
params: Vec<{ name, default: Option<Expr>, span }>
|
||||
```
|
||||
|
||||
### 8.2 收集规则(函数作用域)
|
||||
|
||||
扫描该函数标题之下、下一同级/更高级标题之前的所有节点,维护**绑定图**与**形参表**(二者分离):
|
||||
|
||||
#### A. 绑定图(所有变量)
|
||||
|
||||
1. **声明事件**:叙述或代码中的首次 `` `名` ``,或粗体内首次对 `名` 的赋值左值。
|
||||
2. **默认/初值事件**:叙述 `` `名`=默认表达式 ``;或符合 §8.3 的「形参默认」赋值。
|
||||
3. **排除出绑定图**(不建变量):
|
||||
- 循环变量 `` - [项](集合) `` 中的 `项`(循环自有绑定);
|
||||
- `self` / `自`(方法自动注入)。
|
||||
|
||||
凡进入绑定图的名字都是**变量**——包括「只在叙述里出现、可执行代码从未读写」的名字(§4.4)。未使用 → **不报错**。
|
||||
|
||||
#### B. 升为形参的条件(升参)
|
||||
|
||||
名字已在绑定图中,且满足下列之一,才进入 `params`:
|
||||
|
||||
| 升参种类 | 条件 |
|
||||
|----------|------|
|
||||
| **必选形参** | 在可执行面(`**…**` / `*…*` / `>` / 结构语句)中存在对 `名` 的**读取**,且该读取无法单靠「不依赖外部输入的局部赋值」满足——典型:先声明、后 `n=n+1` / `*n*` / `**print text=n**` 等读到未先行赋成纯局部常量 |
|
||||
| **可选形参** | 有默认/初值事件(`` `名`=… `` 或 §8.3 默认赋值),供调用方覆盖 |
|
||||
|
||||
**不升参**:仅叙述声明、可执行面零读取(死绑定)→ 留在绑定图,**不进** `params`,调用签名不变。
|
||||
|
||||
**顺序**:按升参名字的**首次声明事件**在源码中的出现序。
|
||||
|
||||
**仍排除**:分支/块内纯局部(金样例钉启发式);显式 `+` 合并见 §8.4。
|
||||
|
||||
### 8.3 「形参默认」与「函数体赋值」的区分
|
||||
|
||||
```markdown
|
||||
## 问候
|
||||
对`谁`打招呼,默认`礼貌`=False。
|
||||
|
||||
**print text=谁**
|
||||
```
|
||||
|
||||
- `` `谁` `` → 必选
|
||||
- `` `礼貌`=False `` → 可选,默认 `False`
|
||||
- 体里的 `**print …**` 不是给 `谁` 赋默认值
|
||||
|
||||
```markdown
|
||||
## 加一函数
|
||||
输入`n`。**n=n+1**返回*n*。
|
||||
```
|
||||
|
||||
- `` `n` `` 先声明 → 必选
|
||||
- `**n=n+1**` 是**体语句**(对已声明形参赋值),**不是**默认值
|
||||
|
||||
判别启发式(实现契约):
|
||||
|
||||
- 若赋值右值**依赖同名左值**(如 `n=n+1`)→ 体语句。
|
||||
- 若赋值出现在「该名被当作输入读取」之前,且右值不依赖未绑定的同名 → 可作为默认值候选。
|
||||
- 叙述形 `` `名`=字面量 `` 优先视为默认值声明。
|
||||
|
||||
### 8.4 显式 `+` 形参(过渡)
|
||||
|
||||
- 若函数标题下仍有 `` + `名` `` 行:与推断结果**合并**;冲突时 **显式 `+` 胜出**并诊断警告。
|
||||
- 迁移完成后(路线图 M4)可改为:存在 `+` 则关闭推断,或直接废弃 `+`。
|
||||
|
||||
### 8.5 调用绑定
|
||||
|
||||
与现有一致:具名优先,位置按「尚未绑定的形参」从左到右填充。缺必选形参 → 语义错误。
|
||||
|
||||
---
|
||||
|
||||
## 9. 完整示例(规范金样意向)
|
||||
|
||||
### 9.1 加一(动机例)
|
||||
|
||||
```markdown
|
||||
## 加一函数
|
||||
|
||||
对于输入变量`n`,我们执行操作**n=n+1**接着返回*n*。
|
||||
|
||||
# main
|
||||
|
||||
我要调用加一函数可以采用这样的办法:
|
||||
|
||||
> 加一函数 37
|
||||
|
||||
或者可以直接这么调用**加一函数 37**
|
||||
```
|
||||
|
||||
期望:
|
||||
|
||||
- 签名:`加一函数(n)`
|
||||
- `# main` 两次调用均返回 `38`(第二次若未绑定到打印,至少 AST/求值结果为 38;可用 `**print text=…**` 观测)。
|
||||
|
||||
### 9.2 带默认值
|
||||
|
||||
```markdown
|
||||
## 问候
|
||||
|
||||
向`谁`问好;`礼貌`=False 时用短句。
|
||||
|
||||
1. 礼貌
|
||||
**print text=您好,**
|
||||
**print text=谁**
|
||||
2. *
|
||||
**print text=嗨,**
|
||||
**print text=谁**
|
||||
|
||||
---
|
||||
|
||||
# main
|
||||
|
||||
**问候 谁=Marqdo 礼貌=True**
|
||||
> 问候 Marqdo
|
||||
```
|
||||
|
||||
### 9.3 对象方法(不变骨架)
|
||||
|
||||
```markdown
|
||||
# 计数器
|
||||
## 加
|
||||
将`self`的`值`增加`delta`(`delta`=1)。
|
||||
**值 = 值 + delta**
|
||||
*self*
|
||||
|
||||
# main
|
||||
*c = > 计数器*
|
||||
**c.加 3**
|
||||
```
|
||||
|
||||
(方法形参推断含 `delta`;`self` 自动。)
|
||||
|
||||
---
|
||||
|
||||
## 10. AST / 管线变更要点(设计约束)
|
||||
|
||||
详细里程碑见 [markup-v0.3.md](../roadmap/markup-v0.3.md)。此处只钉**语义 → 树**的约束,供实现对照:
|
||||
|
||||
### 10.1 行分类(lex / line-class)
|
||||
|
||||
新增或调整类别:
|
||||
|
||||
| 类别 | 说明 |
|
||||
|------|------|
|
||||
| `Prose` | 叙述行;需**内联扫描** |
|
||||
| `BoldCode` | 整行或片段 `**…**` |
|
||||
| `ItalicReturn` | 整行或片段 `*…*`(非 else 臂) |
|
||||
| `CallLine` | `>` 调用(保留) |
|
||||
| … | 原有 Heading / List / Table / Fence / Hr |
|
||||
|
||||
**内联扫描**产出 `InlineBit`:`Text` | `IdentDecl/Ref` | `BoldCode` | `ItalicReturn`。
|
||||
|
||||
### 10.2 AST 节点调整(建议)
|
||||
|
||||
```text
|
||||
Param { name, default?, inferred: bool, span } // inferred=true 表示来自体推断
|
||||
|
||||
Stmt::
|
||||
Assign { … } // 多由 BoldCode 解析
|
||||
Call { … } // CallLine 或 BoldCode 判别为调用
|
||||
Return { value } // 由 ItalicReturn 解析(原由 Bold)
|
||||
ExprStmt { … } // 可选:纯表达式粗体
|
||||
Prose { bits } // 可选:保留叙述结构供 view/catalog;求值阶段只消费 Decl
|
||||
|
||||
FnDef.params:
|
||||
由 InferParams(body + prose bits) 填充,再合并显式 +
|
||||
```
|
||||
|
||||
`Stmt::Return` 的**语法来源**从粗体改为斜体;dump 文本应写 `return←italic`。
|
||||
|
||||
### 10.3 Pass1 / Pass2
|
||||
|
||||
- Pass1:收集 `#`/`##` 结构;建绑定图;跑 **ParamInfer(升参)**;登记名表。
|
||||
- Pass2:粗体内调用名解析;叙述 Decl 不重复建参。
|
||||
- 诊断:**必选缺失**、`+` 与推断冲突、空返回词法歧义(非整行 `**` 的残缺粗体)。
|
||||
- Lint(可选、默认关或降级为 hint):绑定图中「从未读写」的死变量——**不得**当错误。
|
||||
|
||||
### 10.4 双后端
|
||||
|
||||
树遍历与字节码均消费同一 AST;字节码发射仅跟随 `Stmt`/`Expr` 变化,不感知 Markdown 标记。
|
||||
|
||||
---
|
||||
|
||||
## 11. 破坏性切换(无双模式)
|
||||
|
||||
**产品决定(2026-09-13):** 直接以 v0.3 为唯一运行时映射;**不**保留 `--markup v0.2` / 双 edition。旧语法金样例与库文件在迁移完成前可能失败——可接受。
|
||||
|
||||
| 阶段 | 行为 |
|
||||
|------|------|
|
||||
| 现在 | 解析器切到 v0.3;`tests/markup-v03/` 为门禁 |
|
||||
| 随后 | 批量改写 `tests/structure|keywords`、`lib/`、`ext/`、Skill、`public/` |
|
||||
| 文档 | `markdown-mapping.md` 改为指向本文;ADR 0005 → Accepted |
|
||||
|
||||
**机械改写:**
|
||||
|
||||
- 语句 `*a = 1*` → `**a = 1**`
|
||||
- 返回 `**x**` → `*x*`
|
||||
- 粗体内文本字面量须引号:`**print text="hi"**`(裸词 = 变量)
|
||||
- 调用可保留 `>` 或改为粗体
|
||||
- `` + `n` `` 可删,改为叙述 `` `n` `` + 升参
|
||||
|
||||
---
|
||||
|
||||
## 12. 开放问题 / 已决议
|
||||
|
||||
| # | 议题 | 状态 | 决议摘要 |
|
||||
|---|------|------|----------|
|
||||
| 1 | 空返回词法 | **已决议** | §7.2:推荐 `*None*`/`*无*`;整行 `**`;兼容 `****`;`---` 仅叙述跳过 |
|
||||
| 2 | 提及性反引号 | **已决议** | §4.4:一律视作变量;未使用不报错、不升参;不设提及前缀 |
|
||||
| 3 | 粗体内调用 vs 赋值 | **已落地** | §6.2:可赋值左值 → 赋值;否则表达式优先、再裸调用;`**n + 1**` = ExprStmt |
|
||||
| 4 | `` `n`+1 `` 误声明 | **已落地** | Decl 名须为标识符;`` `n+1` `` 不升 Decl |
|
||||
| 5 | 叙述强调斜体 vs 返回 | **已落地** | 整行 / `返回*…*` / 表达式形才当返回;`*only*` `*very important*` `*foo.bar*` 为叙述 |
|
||||
| 6 | 一行多 `**…**` | **已落地** | 允许,按出现序执行(`tests/markup-v03/multi-bold.mq.md`) |
|
||||
| 7 | view 展示 prose Decl | **已落地** | Structure / Functions 大纲:`inferred` 形参标注(`chip inferred`) |
|
||||
|
||||
---
|
||||
|
||||
## 13. 非目标
|
||||
|
||||
- 不把整篇无标记 Markdown 变成可执行程序。
|
||||
- 不引入 `def` / `return` 关键字(空返回用标记,见 §7.2)。
|
||||
- 不改变 `#` / `##` 对象体系与 ext 插件 ABI。
|
||||
- 不在本文阶段修改解释器代码(见路线图)。
|
||||
- 不为「提及」另发明一套反引号方言(§4.4)。
|
||||
|
||||
---
|
||||
|
||||
## 14. 验收标准(设计完成 ≠ 实现完成)
|
||||
|
||||
设计稿验收:
|
||||
|
||||
- [x] 哲学 P1–P6 成文
|
||||
- [x] 与 v0.2 对照表
|
||||
- [x] 形参推断规则可实现(含升参 vs 死绑定)
|
||||
- [x] 动机示例在语义上闭合
|
||||
- [x] AST/管线约束与路线图挂接
|
||||
- [x] ADR 记录决策意向
|
||||
- [x] **空返回**对照其它语言并钉死词法
|
||||
- [x] **提及/未使用变量**政策钉死
|
||||
|
||||
实现验收:
|
||||
|
||||
- [x] 金样例夹具 `tests/markup-v03/`(`gold.rs` `markup_v03_*`)
|
||||
- [x] 动机示例金样例通过(`inc-prose.mq.md`)
|
||||
- [x] `--dump-ast` 可见 inferred params 与死绑定;`--dump-lines` 标注 `[decl]` / `[bold]` / `[italic]`
|
||||
- [x] 空返回四种形式金样例通过
|
||||
- [x] 无 v0.2 双模式(默认即 v0.3)
|
||||
|
||||
---
|
||||
|
||||
## 15. 修订历史
|
||||
|
||||
| 日期 | 说明 |
|
||||
|------|------|
|
||||
| 2026-09-13 | 初稿:叙述统一、粗体代码、斜体返回、形参体推断;Proposed |
|
||||
| 2026-09-13 | 决议空返回(§7.2)与提及性反引号(§4.4);形参改为「升参」与绑定图分离(§8.2) |
|
||||
| 2026-09-14 | §7.2:`---` 不再收束;返回语句结束函数体解析;空返回首选 `*None*` |
|
||||
| 2026-09-14 | 取元主语法改为 `[键](集合)`;脚注取元过渡保留 |
|
||||
@@ -2,9 +2,10 @@
|
||||
|
||||
| | |
|
||||
|---|---|
|
||||
| 状态 | 已定论(修订:形参 `+`、分支 `1.`、同级再 `1.` 为新分支、标识符反引号、`-` 专用于循环) |
|
||||
| 状态 | **历史文档(v0.2 · 已废止为运行时)** — 现行见 **[markdown-mapping-v0.3.md](markdown-mapping-v0.3.md)** |
|
||||
| 日期 | 2026-08-07 |
|
||||
| 取代 | v0.1 中「函数头 `-` 形参 / 裸名形参与遍历变量 / `+` 分支」 |
|
||||
| 被取代 | **[markdown-mapping-v0.3.md](markdown-mapping-v0.3.md)**(粗体即代码 · 斜体即返回 · 无双模式兼容) |
|
||||
| 相关 | [objects.md](objects.md) · [code-vs-comment.md](code-vs-comment.md) · [return-hr-and-code-surface.md](return-hr-and-code-surface.md) · [module-namespace.md](module-namespace.md) |
|
||||
|
||||
Markdown **标记即语法**。输出**不是**语言架构原语,而是内置函数 **`print`**(英文;见 [keywords.md](keywords.md))。
|
||||
|
||||
@@ -23,9 +23,9 @@ marqdo dump FILE --stage lines|tokens|ast|sema|all
|
||||
|
||||
| 标志 | 阶段 | 输出内容 |
|
||||
|------|------|----------|
|
||||
| `--dump-lines` | 行分类 | 每行:`LINE kind=Comment\|Code\|Blank` + 原文预览 |
|
||||
| `--dump-lines` | 行分类 | 每行:`kind=Comment\|Code\|Blank` + 原文;v0.3 行内位 `[decl n]` / `[bold …]` / `[italic …]` |
|
||||
| `--dump-tokens` | 词法 | Token 流:`type lexeme line:col` |
|
||||
| `--dump-ast` | 语法 | S 表达式或缩进树(模块/函数/语句) |
|
||||
| `--dump-ast` | 语法 | 模块/函数/语句;形参带 `inferred`;叙述死绑定 `dead=[…]` |
|
||||
| `--dump-sema` | 语义 | 作用域、导入图、提升后的符号表 |
|
||||
| `--trace-eval` | 求值 | **JSON 行**(stderr):语句级事件,含 `path` / `span`(`line:col`) |
|
||||
| `--dump-bytecode` | 字节码 | 反汇编 `Program`(指令旁带 `@line:col`;见 [bytecode.md](bytecode.md)) |
|
||||
|
||||
@@ -2,18 +2,36 @@
|
||||
|
||||
| | |
|
||||
|---|---|
|
||||
| 状态 | 已决议(并入 mapping v0.1 + keywords;2026-08-04 修订函数收束) |
|
||||
| 状态 | **v0.2 已决议**(现行实现);**v0.3 拟对调 `*` / `**` 角色**(见下) |
|
||||
| 日期 | 2026-08-04 |
|
||||
| 修订 | 2026-09-13:挂接 [markdown-mapping-v0.3.md](markdown-mapping-v0.3.md) |
|
||||
|
||||
---
|
||||
|
||||
## 决议
|
||||
## 决议(v0.2 · 现行)
|
||||
|
||||
1. **`*…*` = 程序语句**。
|
||||
2. **`**…**` = 返回值**(架构级);空粗体 `****` / `** **` = 空返回(`None`)并结束函数体。
|
||||
3. **输出**用内置函数 **`print`**(英文),不是粗体,不是中文名。
|
||||
4. **`---` / `***`(函数体顶层)**:结束本函数体(无返回值函数收束);**不是**分支/循环装饰框。
|
||||
4. **`---` / `***`**:Markdown 叙述分隔(跳过);**不再**结束函数体。无值收束用 `*None*` / 整行 `**` / `****`(见 [markdown-mapping-v0.3.md](markdown-mapping-v0.3.md) §7.2)。
|
||||
5. **成段注释**:空行分段;段内续行不因首字符升级为代码。
|
||||
6. **否决**:无标记行 = 默认代码。
|
||||
|
||||
详见 [keywords.md](keywords.md)、[markdown-mapping.md](markdown-mapping.md)、[code-vs-comment.md](code-vs-comment.md)。
|
||||
|
||||
---
|
||||
|
||||
## v0.3 意向(Proposed · 未实现)
|
||||
|
||||
产品方重新审视后,拟在 [ADR 0005](../adr/0005-prose-unified-markup.md) 下**对调**架构标记,并放宽叙述面:
|
||||
|
||||
| 概念 | v0.2 | v0.3 草案 |
|
||||
|------|------|-----------|
|
||||
| 代码段 / 语句 | `*…*` | `**…**` |
|
||||
| 返回值 | `**…**` | `*…*` |
|
||||
| 空返回 | `****` / 空粗体;或 `---` | **推荐 `*None*`/`*无*`**;整行 `**`;兼容 `****`;`---` 仅叙述 |
|
||||
| 输出 | 仍为 `print` / `打印` | 不变 |
|
||||
| 无标记 = 默认代码 | 否决 | **仍否决** |
|
||||
| 叙述中 `` `名` `` | 通常无绑定义 | 一律变量;未使用 OK;升参需可执行面读取 |
|
||||
|
||||
完整规则与迁移见 [markdown-mapping-v0.3.md](markdown-mapping-v0.3.md)。**v0.3 已为运行时;本文件历史决议中「`---` 收束」已废止。**
|
||||
@@ -11,9 +11,9 @@
|
||||
|
||||
| 读 | 写 |
|
||||
|----|----|
|
||||
| 脚注 `` `xs`[^1] `` / `` `m`[^key] `` / 嵌套 `` `m`[^a][^1] `` | **`table.put` / `表.改`** |
|
||||
| 链接取元 `[key](xs)` / `[key](m)` / 嵌套 `[1]([a](m))`(脚注 `` `m`[^k] `` 仍兼容) | **`table.put` / `表.改`** |
|
||||
|
||||
`put` / `改` 的 `at=`(`于=`)与脚注同构:文本键、**1-based** 整数下标,或键/下标组成的路径列表。
|
||||
`put` / `改` 的 `at=`(`于=`)与取元同构:文本键、**1-based** 整数下标,或键/下标组成的路径列表。
|
||||
|
||||
```markdown
|
||||
---
|
||||
@@ -22,7 +22,7 @@ import table:lib/table.mq.md
|
||||
|
||||
# main
|
||||
|
||||
*`h` = > table.put in=None at=Authorization value=Bearer-x*
|
||||
**`h` = [table.put] in=None at="Authorization" value="Bearer-x"**
|
||||
|
||||
`xs` =
|
||||
|
||||
@@ -31,7 +31,8 @@ import table:lib/table.mq.md
|
||||
| a |
|
||||
| b |
|
||||
|
||||
*`xs` = > table.put in=`xs` at=1 value=A*
|
||||
**`xs` = [table.put] in=`xs` at=1 value="A"**
|
||||
**打印 内容=[Authorization](h)**
|
||||
```
|
||||
|
||||
`in=None` 且 `at=` 为单个文本键 → 新建单键字典。值一律不可变更新(返回新集合)。
|
||||
|
||||
@@ -4,8 +4,9 @@
|
||||
|---|---|
|
||||
| 状态 | **S0–S3 + 核心 L1 + Mid M1–M6 + Mid2 M7–M10 已落地** |
|
||||
| 日期 | 2026-09-09 |
|
||||
| 相关 | [keywords.md](keywords.md) · [objects.md](objects.md) · [call-arguments.md](call-arguments.md) · [stdlib-i18n.md](stdlib-i18n.md) · [stdlib-modules.md](stdlib-modules.md) · [**stdlib-mid.md**](stdlib-mid.md) · [**stdlib-mid2.md**](stdlib-mid2.md) · [module-namespace.md](module-namespace.md) · [ext-abi.md](ext-abi.md) |
|
||||
| 相关 | [keywords.md](keywords.md) · [objects.md](objects.md) · [call-arguments.md](call-arguments.md) · [lib-code-as-docs.md](lib-code-as-docs.md) · [stdlib-i18n.md](stdlib-i18n.md) · [stdlib-modules.md](stdlib-modules.md) · [**stdlib-mid.md**](stdlib-mid.md) · [**stdlib-mid2.md**](stdlib-mid2.md) · [module-namespace.md](module-namespace.md) · [ext-abi.md](ext-abi.md) |
|
||||
|
||||
> **库写法(代码即文档)**:[lib-code-as-docs.md](lib-code-as-docs.md) · [roadmap/lib-ext-code-as-docs.md](../roadmap/lib-ext-code-as-docs.md)。
|
||||
> **多语言库命名**:见 [stdlib-i18n.md](stdlib-i18n.md)(不设 `lang:`;中英分文件)。
|
||||
> **L1 模块清单**(含 math/foreign/plugin):见 [stdlib-modules.md](stdlib-modules.md)。
|
||||
> **中层标准库 Mid(M1–M6)**:已落地——[stdlib-mid.md](stdlib-mid.md) · [roadmap/stdlib-mid.md](../roadmap/stdlib-mid.md)。
|
||||
|
||||
@@ -0,0 +1,85 @@
|
||||
# Ubuntu PPA packaging (Marqdo)
|
||||
|
||||
| | |
|
||||
|---|---|
|
||||
| Status | **Active** — `ppa:cflmy/marqdo`; noble builds need bundled Rust (Cargo.lock v4) |
|
||||
| Maintainer | cflmy \<pingan@cflmy.cn\> |
|
||||
| GPG | `505943294D04C803` (fingerprint `52A1…C803`) |
|
||||
| PPA | `ppa:cflmy/marqdo` |
|
||||
|
||||
## Goal
|
||||
|
||||
Users install with:
|
||||
|
||||
```bash
|
||||
sudo add-apt-repository ppa:cflmy/marqdo
|
||||
sudo apt update
|
||||
sudo apt install marqdo
|
||||
```
|
||||
|
||||
CLI and extension packs stay independent: the `.deb` ships the **interpreter**; `marqdo ext add …` still pulls from **https://ext.marqdo.com** (then GitHub / proxy).
|
||||
|
||||
## Why bundled Rust?
|
||||
|
||||
Ubuntu **noble** ships cargo/rustc **1.75**, which cannot parse **Cargo.lock version 4** (`lock file version 4 requires -Znext-lockfile-bump`). Launchpad builders also have **no network**, so `ppa-build-source.sh` vendors crates **and** installs a modern toolchain into `third_party/rust` inside the `.orig.tar.xz`. `debian/rules` prefers that toolchain over distro cargo.
|
||||
|
||||
## One-time Launchpad setup
|
||||
|
||||
1. Create PPA: https://launchpad.net/~cflmy/+activate-ppa → name e.g. `marqdo`
|
||||
2. OpenPGP key already on Launchpad (done)
|
||||
3. Sign Ubuntu Code of Conduct if Launchpad asks
|
||||
4. Enable the Ubuntu **series** you upload for (e.g. noble) under PPA → Change details
|
||||
5. On the build machine:
|
||||
|
||||
```bash
|
||||
sudo apt install build-essential debhelper devscripts dput lintian \
|
||||
dpkg-dev quilt cargo rustc pkg-config curl xz-utils
|
||||
```
|
||||
|
||||
## Package layout
|
||||
|
||||
| File | Role |
|
||||
|------|------|
|
||||
| `debian/control` | Metadata (amd64; no distro cargo BD) |
|
||||
| `debian/changelog` | Upload revisions (`1ppaN`) |
|
||||
| `debian/rules` | `dh` + bundled/system cargo build |
|
||||
| `scripts/ppa-build-source.sh` | Vendor + bundle Rust + `debuild -S` |
|
||||
| `scripts/ppa-ship.sh` | apt deps + build + `dput` |
|
||||
|
||||
## Versioning
|
||||
|
||||
- Upstream SemVer: `Cargo.toml` / git tag `vX.Y.Z`
|
||||
- Debian revision: `X.Y.Z-1ppaN~SERIES` (SERIES = `noble`, …) — bump `1ppaN` on packaging-only reuploads
|
||||
- **Ext pack** SemVer (`ext/VERSION`) is **not** the deb version
|
||||
|
||||
## One-shot (recommended)
|
||||
|
||||
```bash
|
||||
cd ~/work/marqdo
|
||||
./scripts/ppa-ship.sh noble # tools → debuild -S → dput
|
||||
./scripts/ppa-ship.sh noble -n # build only
|
||||
```
|
||||
|
||||
If automation cannot enter sudo/GPG, tell the user these commands (do not invent alternatives):
|
||||
|
||||
```bash
|
||||
./scripts/ppa-build-source.sh noble
|
||||
dput ppa:cflmy/marqdo ../build-area/marqdo_*~noble_source.changes
|
||||
```
|
||||
|
||||
Watch: https://launchpad.net/~cflmy/+archive/ubuntu/marqdo/+builds
|
||||
|
||||
## Failure notes
|
||||
|
||||
| Symptom | Fix |
|
||||
|---------|-----|
|
||||
| `lock file version 4 requires -Znext-lockfile-bump` | Rebuild with current `ppa-build-source.sh` (bundles Rust); bump `1ppaN` |
|
||||
| `failed to calculate checksum of: …/vendor/…/Cargo.toml.orig` | `dh_clean` purged `*.orig`; fixed via `dh_clean -Xvendor/` (+ strip `.orig` only when **creating a new** orig); bump `1ppaN` with **`-sd`** |
|
||||
| `orig.tar.xz already exists … different contents` | Never rewrite an uploaded upstream `.orig`; reuse PPA file (`ppa-build-source.sh` downloads it) and `debuild -S -sd` |
|
||||
| Same version rejected by Launchpad | Bump `debian/changelog` (`1ppa2`, …) |
|
||||
| Wrong series | Enable series on PPA; rebuild with that series name |
|
||||
|
||||
## Out of scope (v1 deb)
|
||||
|
||||
- Shipping `ext/native/*.so` inside the deb (use CDN `ext add`)
|
||||
- WASM / VSIX / non-amd64
|
||||
@@ -0,0 +1,35 @@
|
||||
# View:Markup 表面保真
|
||||
|
||||
| | |
|
||||
|---|---|
|
||||
| 状态 | **Active** |
|
||||
| 日期 | 2026-09-14 |
|
||||
| 相关 | [view.md](view.md) · [bracket-call-modifiers.md](bracket-call-modifiers.md) · [collection-access-link.md](collection-access-link.md) · [markdown-mapping-v0.3.md](markdown-mapping-v0.3.md) |
|
||||
|
||||
---
|
||||
|
||||
## 1. 目标
|
||||
|
||||
`marqdo view` 的 Structure / 表达式展示应**贴近作者写出的 Markup**,而不是内部 AST 的旧拼法。读者从 view 抄回源文件时,应仍是合法、推荐的表面。
|
||||
|
||||
## 2. 表面对照
|
||||
|
||||
| AST / 概念 | View 优先显示 | 备注 |
|
||||
|------------|---------------|------|
|
||||
| `Expr::Index` | `[键](基)` | 嵌套 `[k2]([k1](base))` |
|
||||
| `InterpPart::Index` | 同上嵌套链接形 | 不再默认 `` `base`[^k] `` |
|
||||
| `CallExpr` + `bracket_marked` / `pre_modifiers` | `修饰 [callee] 实参…` 或 `[callee] 实参…` | 仅经典 `>` 解析时仍显示 `> callee …` |
|
||||
| 赋值 / 返回 | 粗体 / 斜体语义即可 | 不强制还原整句叙述 |
|
||||
| foreach | `- [项](集合)` | 不变 |
|
||||
|
||||
## 3. 非目标
|
||||
|
||||
- 不把 view 做成第二语法;解析真相仍在 mapping / call-arguments。
|
||||
- 不删除对脚注取元、旧 `>` 调用的兼容显示需求时,可用次要提示,但默认推荐面优先。
|
||||
|
||||
## 4. 修订历史
|
||||
|
||||
| 日期 | 说明 |
|
||||
|------|------|
|
||||
| 2026-09-14 | 初稿;Index 链接形 + 括号调用修饰表面 |
|
||||
| 2026-09-14 | `bracket_marked`:无修饰的 `[callee]` 也保真显示 |
|
||||
+1
-1
@@ -4,7 +4,7 @@
|
||||
|---|---|
|
||||
| 状态 | 已定(v0.0.2 方向) |
|
||||
| 日期 | 2026-08-04 |
|
||||
| 相关 | [examples-and-tests.md](examples-and-tests.md) · [generated-yaml-manifest.md](generated-yaml-manifest.md) · 视觉参考 [id.cflmy.cn](https://id.cflmy.cn) |
|
||||
| 相关 | [examples-and-tests.md](examples-and-tests.md) · [view-markup-surface.md](view-markup-surface.md) · [generated-yaml-manifest.md](generated-yaml-manifest.md) · 视觉参考 [id.cflmy.cn](https://id.cflmy.cn) |
|
||||
|
||||
---
|
||||
|
||||
|
||||
@@ -0,0 +1,66 @@
|
||||
# 路线图:代码即文档叙述面摩擦(G1–G4)
|
||||
|
||||
| | |
|
||||
|---|---|
|
||||
| 状态 | **Done**(实现已合入工作树;金样绿) |
|
||||
| 日期 | 2026-09-14 |
|
||||
| 设计 | [code-as-docs-gaps.md](../design/code-as-docs-gaps.md) |
|
||||
| 样例 | `examples/code-as-docs/index.mq.md` |
|
||||
|
||||
---
|
||||
|
||||
## 里程碑
|
||||
|
||||
### M1 — 文档与金样夹具
|
||||
|
||||
- [x] 设计文档记录 G1–G4 与启发式
|
||||
- [x] 本路线图
|
||||
- [x] `tests/markup-v03/` 四缝金样 + `gold.rs` `markup_v03_*`
|
||||
|
||||
### M2 — G1 模块级 `---`
|
||||
|
||||
- [x] `parse_classified`:顶层 frame 行 skip;顶层 Comment 引言 skip
|
||||
- [x] 函数体内 `---` / `***` 改为叙述跳过(不再收束;空返回收束)
|
||||
- [x] 金样:`module-hr.mq.md`
|
||||
|
||||
### M3 — G3 浮点面量与运算
|
||||
|
||||
- [x] `Literal::Num(f64)`
|
||||
- [x] `parse_primary` 识别 `digits.digits`(及 `.5` / `3.` 形态)
|
||||
- [x] `eval_binary` + bytecode Int/Num 提升(Int/Int `/` 仍为整除)
|
||||
- [x] 金样:`float-discount.mq.md`
|
||||
|
||||
### M4 — G2 叙述强调启发式
|
||||
|
||||
- [x] `scan_prose_line`:非代码形粗体、非返回形行内斜体 → 丢弃
|
||||
- [x] 保持 `**n=n+1**`、`**加一 37**`、整行 `*n*`、「返回*n*」
|
||||
- [x] 更新 Skill:允许装饰性强调;可执行仍看形状
|
||||
- [x] 金样:`soft-emphasis.mq.md`
|
||||
|
||||
### M5 — G4 动态脚注键
|
||||
|
||||
- [x] AST:`IndexKey::{Lit,Var}`(`` [^`ident`] ``)
|
||||
- [x] 解析、求值、bytecode
|
||||
- [x] 金样:`dynamic-footnote.mq.md`
|
||||
- [x] 回写 `examples/code-as-docs`(浮点折扣 + 动态键)
|
||||
|
||||
### M6 — 出门
|
||||
|
||||
- [x] `examples/code-as-docs` 展示四缝修复后的写法
|
||||
- [x] `cargo test --test gold` 绿
|
||||
- [x] 设计验收覆盖(见金样)
|
||||
|
||||
---
|
||||
|
||||
## 顺序建议
|
||||
|
||||
G1(小)→ G3(中,Literal/运算)→ G2(启发式,依赖金样钉行为)→ G4(AST 面)→ 回写样例。
|
||||
|
||||
---
|
||||
|
||||
## 修订历史
|
||||
|
||||
| 日期 | 说明 |
|
||||
|------|------|
|
||||
| 2026-09-14 | 初稿 |
|
||||
| 2026-09-14 | 实现完成并勾选 |
|
||||
@@ -0,0 +1,59 @@
|
||||
# Roadmap:lib / ext 代码即文档
|
||||
|
||||
| | |
|
||||
|---|---|
|
||||
| 状态 | **Active** |
|
||||
| 日期 | 2026-09-14 |
|
||||
| 相关 | [lib-code-as-docs.md](../design/lib-code-as-docs.md) · [view-markup-surface.md](../design/view-markup-surface.md) · [bracket-call-modifiers.md](../design/bracket-call-modifiers.md) · [collection-access-link.md](../design/collection-access-link.md) |
|
||||
|
||||
---
|
||||
|
||||
## 0. 总序(防返工)
|
||||
|
||||
1. **方括号标记调用**(设计 + AST + 金样)— **已落地**
|
||||
2. lib / view 设计文档 — **已写**
|
||||
3. View 表面(Index 链接形、括号调用)— **已落地**
|
||||
4. 分波改造 `lib/*` → `ext/*`
|
||||
|
||||
旧 `>` / 粗体调用、脚注取元解析均保留。
|
||||
|
||||
## 1. 里程碑
|
||||
|
||||
| 波 | 内容 | 状态 |
|
||||
|----|------|------|
|
||||
| **Call** | `pre_modifiers`;`tests/structure/bracket-call.mq.md`;mapping / call-arguments | **done** |
|
||||
| **M0 View** | `InterpPart::Index` → `[k](base)`;`call_display` 修饰表面 | **done** |
|
||||
| **M1** | 试点 `lib/table` · `lib/text` · `lib/json`(中英)+ public/stdlib | **done** |
|
||||
| **M2** | 其余 `lib/*` 叙述化;禁新脚注取元 | **done** |
|
||||
| **M3–M4** | `ext/web`、`ext/ai`:脚注→链接取元;叙述;示例可逐步换括号调用 | **done**(取元迁移) |
|
||||
| **M5** | quantum / linalg + full gold | **done** |
|
||||
| **M6** | examples + public/structure + tests/ext·lib 链接取元;cafe 括号调用例 | **done** |
|
||||
| **M7** | structure collection 金样改链接形;public/stdlib 括号调用例 | **done** |
|
||||
| **M8** | 教程第 9 章 + Skill examples → 链接取元 / v0.3 标记 | **done** |
|
||||
| **M9** | 教程其余章节(1–8、10–12、14)全面对齐 v0.3 + 链接取元 | **done** |
|
||||
| **M10** | public/stdlib 剩余演示统一括号调用;public import 返回面修到 v0.3 | **done** |
|
||||
| **M11** | View:`bracket_marked` 使无修饰 `[callee]` 也显示括号形 | **done** |
|
||||
|
||||
## 2. 验收(出门)
|
||||
|
||||
- 括号调用与 `[k](c)` 取元金样并存、不回归。
|
||||
- 试点库可读:目的句 + 叙述形参 + 一例 + 短实现。
|
||||
- `cargo test --test gold` 绿。
|
||||
- 脚注取元金样(`tests/structure/footnote*`)仍保留作兼容门禁。
|
||||
- 教程与 Skill 示例以链接取元 / `**` 代码 / `*` 返回为准。
|
||||
|
||||
## 3. 修订历史
|
||||
|
||||
| 日期 | 说明 |
|
||||
|------|------|
|
||||
| 2026-09-14 | 初稿;Call + M0 标 done |
|
||||
| 2026-09-14 | M1 试点 table/text/json + public/stdlib 标 done |
|
||||
| 2026-09-14 | M2 其余 lib 叙述化标 done |
|
||||
| 2026-09-14 | M3–M4 ext/web+ai 脚注→链接取元 |
|
||||
| 2026-09-14 | M5 quantum/linalg 叙述 + public/features 取元 |
|
||||
| 2026-09-14 | M6 examples/public/tests 批量链接取元 + cafe 括号调用 |
|
||||
| 2026-09-14 | M7 structure collection 金样 + stdlib 括号调用例 |
|
||||
| 2026-09-14 | M8 教程 + Skill examples 同步 |
|
||||
| 2026-09-14 | M9 教程全书对齐 v0.3 标记与链接取元 |
|
||||
| 2026-09-14 | M10 public/stdlib 括号调用扫尾 + import 返回面 |
|
||||
| 2026-09-14 | M11 View `bracket_marked` 无修饰括号调用表面 |
|
||||
@@ -0,0 +1,111 @@
|
||||
# 路线图:Marqdo Markdown 语法映射 v0.3(叙述统一)
|
||||
|
||||
「Markup」= Marqdo 把 Markdown 标记当成语法的那一层(不是另一个产品)。v0.3 = 现行映射:粗体代码、斜体返回。
|
||||
|
||||
| | |
|
||||
|---|---|
|
||||
| 状态 | **Done(v1.0.0)** |
|
||||
| 日期 | 2026-09-13 |
|
||||
| 设计 | [markdown-mapping-v0.3.md](../design/markdown-mapping-v0.3.md) |
|
||||
| ADR | [0005-prose-unified-markup.md](../adr/0005-prose-unified-markup.md) |
|
||||
| 依赖 | 现有管线 [interpreter.md](interpreter.md) · [pipeline-debug.md](../design/pipeline-debug.md) |
|
||||
|
||||
---
|
||||
|
||||
## 目标
|
||||
|
||||
把 v0.3 宪法落到词法 → AST → 语义 → 双后端,使动机示例(加一函数)成为金样例,并安全迁移存量代码。
|
||||
|
||||
---
|
||||
|
||||
## 里程碑
|
||||
|
||||
### M0 — 设计冻结与双模式骨架(文档 ✅ / 代码 ⏳)
|
||||
|
||||
- [x] 设计文档 + ADR Proposed + 本路线图
|
||||
- [x] **钉死**:空返回词法(设计 §7.2);提及/未使用变量(§4.4);升参 vs 绑定图(§8.2)
|
||||
- [x] **钉死**:一行多 `**…**` 按序执行(设计 §12 #6)
|
||||
- [x] **不做双模式** — 直接 v0.3 默认
|
||||
|
||||
**出门:** 设计评审通过;旗标可切换;无行为默认变化。
|
||||
|
||||
### M1 — 内联扫描与 AST
|
||||
|
||||
- [x] 金样例目录 `tests/markup-v03/`(夹具 + `gold.rs` `#[ignore]`;见目录 README)
|
||||
- [x] `Prose` 行内联扫描:`` `ident` `` / `**…**` / `*…*`
|
||||
- [x] `Stmt::Return` ← italic;`Stmt` ← bold Assign/Call
|
||||
- [x] `Param.inferred` + 升参
|
||||
- [x] `tests/markup-v03/` 金样通过(默认运行时)
|
||||
|
||||
**出门:** `cargo test markup_v03`(无 ignore)绿。
|
||||
|
||||
### M2 — 形参推断
|
||||
|
||||
- [x] `InferParams`:首次 `` `名` `` = 必选;`` `名`=默认 `` = 可选
|
||||
- [x] 体赋值 `n=n+1` 不误判为默认
|
||||
- [x] 与显式 `+` 合并规则 + 警告
|
||||
- [x] 方法 `self`/`自` 排除
|
||||
- [x] 金样例:默认实参、位置/具名调用、粗体内调用
|
||||
|
||||
**出门:** 推断签名与 `+` 兼容套件绿。
|
||||
|
||||
### M3 — 调用面与消歧
|
||||
|
||||
- [x] `**callee args**` ≡ `> callee args`
|
||||
- [x] else 臂 `N. *` 与返回斜体消歧
|
||||
- [x] 一行多 `**…**` 按序执行
|
||||
- [x] 金样例:`---` / `*None*` / 整行 `**` / 兼容 `****`;叙述死绑定不升参
|
||||
- [x] 诊断:必选缺失、未知 callee(已有 errors 金样);死变量不报错
|
||||
- [x] 残缺粗体:与 GAP-06/07「未闭合后恢复」冲突,保持 Comment 跳过恢复,不硬报错
|
||||
- [x] 粗体内表达式语句:`**n + 1**` 求值后丢弃(非误判为调用)
|
||||
- [x] 叙述斜体:仅整行 / `返回*…*` / 表达式形当返回(`*very important*` 不收束函数)
|
||||
|
||||
**出门:** `tests/markup-v03/*` 覆盖设计 §9 示例。
|
||||
|
||||
### M4 — 双后端与工具
|
||||
|
||||
- [x] 字节码发射跟随新 Stmt 源
|
||||
- [x] `view` / Structure:推断形参 `chip inferred` + Functions 大纲标注
|
||||
- [ ] (可选)`marqdo migrate markup-v03` 机械改写提示/工具
|
||||
|
||||
**出门:** tree 与 bytecode 后端对 `markup-v03` 金样一致。
|
||||
|
||||
### M5 — 默认切换与存量迁移
|
||||
|
||||
- [x] 默认 `MarkupEdition::V03`
|
||||
- [x] 迁移 `tests/**`、`lib/**`、`ext/**`、`public/**`、教程
|
||||
- [x] 更新 `.cursor/skills/marqdo/SKILL.md` 硬规则
|
||||
- [x] 修订 [markdown-mapping.md](../design/markdown-mapping.md) 为 v0.3 正式正文(或声明由 v0.3 文件接任)
|
||||
- [x] ADR 0005 → **Accepted**
|
||||
- [x] CHANGELOG / 发版说明(破坏性:标记对调)— **v1.0.0**
|
||||
|
||||
**出门:** 全量 gold 默认绿(live LLM 无钥跳过);无 v0.2 双模式。
|
||||
|
||||
---
|
||||
|
||||
## 非目标(本路线)
|
||||
|
||||
- 不改插件 ABI / Go libweb
|
||||
- 不引入 `def`/`return` 关键字
|
||||
- M0–M4 不强制改生产 `.mq.md`
|
||||
|
||||
---
|
||||
|
||||
## 风险
|
||||
|
||||
| 风险 | 缓解 |
|
||||
|------|------|
|
||||
| 标记对调导致海量假失败 | 双模式 + 分目录金样;默认晚切换 |
|
||||
| 形参推断误伤局部变量 | 金样例钉启发式;允许过渡期写 `+` |
|
||||
| 空返回 vs `**` 词法 | §7.2 已钉:整行 `**` = 空返回;推荐优先 `---` |
|
||||
| 叙述反引号误升参 | §8.2 升参需可执行面读取;死绑定不进 params |
|
||||
| Skill/AI 仍按 v0.2 生成 | M5 同步 Skill;过渡期文档标明版本 |
|
||||
|
||||
---
|
||||
|
||||
## 修订历史
|
||||
|
||||
| 日期 | 说明 |
|
||||
|------|------|
|
||||
| 2026-09-13 | 初稿与设计/ADR 同步 |
|
||||
| 2026-09-13 | 空返回与提及性反引号决议合入;M0 文档项勾选 |
|
||||
@@ -167,9 +167,12 @@
|
||||
|
||||
---
|
||||
|
||||
## 4. 脚注取元(提案)
|
||||
## 4. 脚注取元(历史 · 过渡保留)
|
||||
|
||||
### 4.1 为何用脚注外形
|
||||
> **主语法已切换为链接形** `[键](集合)`,见 [collection-access-link.md](../design/collection-access-link.md)。
|
||||
> 本节 `` 集合[^键] `` 仍由运行时接受;**新代码请写链接形**。
|
||||
|
||||
### 4.1 为何曾用脚注外形
|
||||
|
||||
- Markdown 已有 `[^…]` 引用形态,读者不陌生。
|
||||
- 避免 `篮子[0]` 与链接 / 图片语法纠缠。
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
| 传统语言 | Marqdo |
|
||||
|----------|--------|
|
||||
| 代码在 `.py`,文档在 `.md` | 代码与文档同在 `.mq.md` |
|
||||
| `def` / `if` / `for` / `return` 是关键字 | 用 Markdown 标记 `##` / `1.` / `-` / `**…**` 表达 |
|
||||
| `def` / `if` / `for` / `return` 是关键字 | 用 Markdown 标记 `##` / `1.` / `-` / `**代码**` / `*返回*` 表达 |
|
||||
| 注释用 `#` 或 `//` | **无标记的叙述就是注释** |
|
||||
| 大括号 `{}` 或缩进界定代码块 | 标题层级 `#` / `##` 界定作用域 |
|
||||
|
||||
|
||||
+15
-15
@@ -6,8 +6,8 @@
|
||||
|
||||
1. **Frontmatter**(可选):文件开头的成对 `---` 之间的元信息,如标题、导入。
|
||||
2. **对象 / 函数定义**:以 `#` / `##` 开头的标题。
|
||||
3. **叙述注释**:无标记的普通文字段落。
|
||||
4. **可执行语句**:以标记开头的行。
|
||||
3. **叙述注释**:无标记的普通文字段落(可含 `` `名` `` 声明/引用)。
|
||||
4. **可执行语句**:粗体代码、独立调用行、标题下的结构行等。
|
||||
|
||||
```markdown
|
||||
---
|
||||
@@ -34,7 +34,7 @@ Marqdo 的注释规则很特别:**无标记的叙述就是注释**,靠空行
|
||||
# main
|
||||
|
||||
这段注释里有一行看起来像代码,但它不会执行:
|
||||
*not_executed = 1*
|
||||
**not_executed = 1**
|
||||
> print text=这也是注释
|
||||
|
||||
空行之后,代码开始运行:
|
||||
@@ -44,22 +44,22 @@ Marqdo 的注释规则很特别:**无标记的叙述就是注释**,靠空行
|
||||
|
||||
> **注意**:叙述与可执行代码之间**必须空一行**。忘记空行会让本意是注释的文字被当作代码,或让代码被吞进注释段。
|
||||
|
||||
## 2.3 标记一览表
|
||||
|
||||
以下标记表示「这是代码」:
|
||||
## 2.3 标记一览表(markup v0.3)
|
||||
|
||||
| 标记 | 含义 |
|
||||
|------|------|
|
||||
| `#` | 对象 / 类型(`# main` = 入口) |
|
||||
| `##` … `######` | 函数 / 方法(嵌套按标题深度) |
|
||||
| `` + `名` `` | 函数标题下的形参 |
|
||||
| `` + `名` `` | 函数标题下的形参(亦可由正文 `` `名` `` 推断) |
|
||||
| `1.` `2.` … | 条件分支 |
|
||||
| `-` | 循环(遍历或 while) |
|
||||
| `> 函数 参数` | 调用 |
|
||||
| `*…*` | 程序语句(赋值 / 表达式) |
|
||||
| `**…**` | 返回值 |
|
||||
| `> 函数 参数` | 调用(可选;粗体内可不写 `>`) |
|
||||
| `修饰 [函数] 实参` | 方括号标记调用(前导词 → `名=True`) |
|
||||
| `**…**` | **代码**(赋值 / 调用) |
|
||||
| `*…*` | **返回值** |
|
||||
| `|` 开头的 GFM 表格 | 集合(列表 / 字典) |
|
||||
| `---` / `***`(函数体内) | 结束函数体 |
|
||||
| `[键](集合)` | 链接取元 |
|
||||
| 单独一行 `---` / `***` | Markdown 分隔线(跳过,**不**结束函数体) |
|
||||
|
||||
## 2.4 标识符与反引号
|
||||
|
||||
@@ -75,7 +75,7 @@ Marqdo 中,**变量、参数名用反引号 `` ` `` 包裹**,这与 Markdown
|
||||
- `+ `谁`` —— 声明形参 `谁`
|
||||
- `> print text=Hello, `谁`!` —— 在字符串中引用变量 `谁`
|
||||
|
||||
> **注意**:反引号规则有例外。在 `*…*`(斜体语句)和 `**…**`(粗体返回)内部,**裸标识符就是变量**,反引号可以省略(详见 [第 3 章](./03-变量与赋值.md))。
|
||||
> **注意**:在 `**…**`(粗体代码)和 `*…*`(斜体返回)内部,**裸标识符就是变量**,反引号可以省略(详见 [第 3 章](./03-变量与赋值.md))。
|
||||
|
||||
## 2.5 字面量
|
||||
|
||||
@@ -98,7 +98,7 @@ Marqdo 的字面量:
|
||||
|
||||
```markdown
|
||||
> print text=Hello World! # 裸 token,按字面量
|
||||
*msg = "Hello, `name`!\n"* # 字符串,可插值、可转义
|
||||
**msg = "Hello, `name`!\n"** # 字符串,可插值、可转义
|
||||
```
|
||||
|
||||
## 2.6 关键字(不可作变量名)
|
||||
@@ -132,12 +132,12 @@ Marqdo 的字面量:
|
||||
|
||||
> print text=你好,`谁`!
|
||||
|
||||
---
|
||||
*None*
|
||||
|
||||
## 加一
|
||||
+ `n`
|
||||
|
||||
**n + 1**
|
||||
*n + 1*
|
||||
```
|
||||
|
||||
运行输出:
|
||||
|
||||
+23
-23
@@ -2,34 +2,34 @@
|
||||
|
||||
## 3.1 什么是变量
|
||||
|
||||
变量是给数据起的一个名字。Marqdo 中,变量在**斜体语句 `*…*`** 中通过 `=` 绑定:
|
||||
变量是给数据起的一个名字。Marqdo 中,变量在**粗体代码 `**…**`** 中通过 `=` 绑定:
|
||||
|
||||
```markdown
|
||||
*x = 1*
|
||||
*name = "Marqdo"*
|
||||
*ok = True*
|
||||
**x = 1**
|
||||
**name = "Marqdo"**
|
||||
**ok = True**
|
||||
```
|
||||
|
||||
> **重要**:在 `*…*` / `**…**` 内部,**裸标识符就是变量**——不需要反引号。这是 Marqdo 的关键约定。
|
||||
> **重要**:在 `**…**` / `*…*` 内部,**裸标识符就是变量**——不需要反引号。这是 Marqdo 的关键约定。
|
||||
|
||||
## 3.2 绑定的三种写法
|
||||
|
||||
### 写法一:斜体语句 `*…*`(推荐)
|
||||
### 写法一:粗体代码 `**…**`(推荐)
|
||||
|
||||
```markdown
|
||||
*x = 1*
|
||||
*y = x + 2*
|
||||
**x = 1**
|
||||
**y = x + 2**
|
||||
```
|
||||
|
||||
这是最常用的绑定方式。裸标识符就是变量。
|
||||
|
||||
### 写法二:行首反引号绑定(无 `*…*`)
|
||||
### 写法二:行首反引号绑定(无粗体)
|
||||
|
||||
```markdown
|
||||
`x` = 1
|
||||
```
|
||||
|
||||
不带 `*…*` 的绑定,变量名**需要反引号**。常用于绑定集合(表格)或公式:
|
||||
不带 `**…**` 的绑定,变量名**需要反引号**。常用于绑定集合(表格)或公式:
|
||||
|
||||
```markdown
|
||||
`篮子` =
|
||||
@@ -42,29 +42,29 @@
|
||||
### 写法三:绑定调用结果
|
||||
|
||||
```markdown
|
||||
*len_s = > len value="hello"*
|
||||
**len_s = > len value="hello"**
|
||||
```
|
||||
|
||||
`*…*` 内用 `= >` 表示「把调用结果赋给变量」。
|
||||
粗体内用 `= >` 表示「把调用结果赋给变量」;也可写成无 `>` 的调用形:`**len_s = len value="hello"**`。
|
||||
|
||||
## 3.3 引用变量
|
||||
|
||||
在 `*…*` 内部,直接写变量名即可:
|
||||
在 `**…**` / `*…*` 内部,直接写变量名即可:
|
||||
|
||||
```markdown
|
||||
*a = 5*
|
||||
*b = a * 2*
|
||||
**a = 5**
|
||||
**b = a * 2**
|
||||
> print text=`b` # 独立 > 调用中,变量要反引号
|
||||
```
|
||||
|
||||
> **关键区别**:在**独立 `>` 调用**(如 `> print …`)里,裸词是**文本**,所以引用变量要加反引号:`> print text=`b``。而在 `*…*` / `**…**` 内,裸词是**变量**:`*b = a * 2*`。
|
||||
> **关键区别**:在**独立 `>` 调用**(如 `> print …`)里,裸词是**文本**,所以引用变量要加反引号:`> print text=`b``。而在 `**…**` / `*…*` 内,裸词是**变量**:`**b = a * 2**`。
|
||||
|
||||
## 3.4 字符串与插值
|
||||
|
||||
### 双引号字符串
|
||||
|
||||
```markdown
|
||||
*msg = "Hello, World!"*
|
||||
**msg = "Hello, World!"**
|
||||
```
|
||||
|
||||
### 转义字符
|
||||
@@ -87,8 +87,8 @@
|
||||
字符串内用 `` `变量` `` 插值:
|
||||
|
||||
```markdown
|
||||
*name = "Marqdo"*
|
||||
*msg = "Hello, `name`!"*
|
||||
**name = "Marqdo"**
|
||||
**msg = "Hello, `name`!"**
|
||||
> print text=`msg` # 输出:Hello, Marqdo!
|
||||
```
|
||||
|
||||
@@ -97,14 +97,14 @@
|
||||
```markdown
|
||||
# main
|
||||
|
||||
*name = "Alice"*
|
||||
*age = 30*
|
||||
*next_age = age + 1*
|
||||
**name = "Alice"**
|
||||
**age = 30**
|
||||
**next_age = age + 1**
|
||||
|
||||
> print text=名字:`name`
|
||||
> print text=明年:`next_age` 岁
|
||||
|
||||
*msg = "你好,`name`!你明年 `next_age` 岁。"*
|
||||
**msg = "你好,`name`!你明年 `next_age` 岁。"**
|
||||
> print text=`msg`
|
||||
```
|
||||
|
||||
|
||||
+12
-10
@@ -2,7 +2,7 @@
|
||||
|
||||
## 4.1 输出:`print` / `打印`
|
||||
|
||||
`print`(中文 `打印`)是内置函数,用于向标准输出写一行文本。**输出不是 `**粗体**`**——粗体是返回值,不是打印。
|
||||
`print`(中文 `打印`)是内置函数,用于向标准输出写一行文本。**输出不是粗体、也不是斜体**——粗体是代码,斜体是返回;打印是普通函数调用。
|
||||
|
||||
```markdown
|
||||
# main
|
||||
@@ -20,19 +20,21 @@
|
||||
|------|------|------|
|
||||
| `> print text=…` | `> 打印 内容=…` | `text` ≡ `内容` |
|
||||
|
||||
粗体内也可写:`**打印 内容="你好"**`(文本字面量须加引号)。
|
||||
|
||||
### 输出变量
|
||||
|
||||
独立 `>` 调用中,变量用反引号:
|
||||
|
||||
```markdown
|
||||
*x = 42*
|
||||
**x = 42**
|
||||
> print text=`x` # 输出:42
|
||||
```
|
||||
|
||||
### 输出拼接
|
||||
|
||||
```markdown
|
||||
*name = "Marqdo"*
|
||||
**name = "Marqdo"**
|
||||
> print text=欢迎使用 `name`!
|
||||
```
|
||||
|
||||
@@ -55,7 +57,7 @@
|
||||
```markdown
|
||||
# main
|
||||
|
||||
*name = > input prompt="请输入名字:"*
|
||||
**name = > input prompt="请输入名字:"**
|
||||
> print text=你好,`name`!
|
||||
```
|
||||
|
||||
@@ -68,10 +70,10 @@
|
||||
|
||||
这是一个人机问答程序。
|
||||
|
||||
*name = > input prompt="你叫什么名字?\n"*
|
||||
**name = > input prompt="你叫什么名字?\n"**
|
||||
> print text=你好,`name`!
|
||||
|
||||
*age = > int value=`age_input`*
|
||||
**age = > int value=`age_input`**
|
||||
```
|
||||
|
||||
> **注意**:上面的示例为了展示 `int` 用法,`age_input` 尚未定义。实际中你需要先从 `input` 得到字符串,再用 `int` 转换。完整可运行版本:
|
||||
@@ -79,12 +81,12 @@
|
||||
```markdown
|
||||
# main
|
||||
|
||||
*name = > input prompt="你叫什么名字?\n"*
|
||||
**name = > input prompt="你叫什么名字?\n"**
|
||||
> print text=你好,`name`!
|
||||
|
||||
*age_str = > input prompt="你几岁?\n"*
|
||||
*age = > int value=`age_str`*
|
||||
*next_age = age + 1*
|
||||
**age_str = > input prompt="你几岁?\n"**
|
||||
**age = > int value=`age_str`**
|
||||
**next_age = age + 1**
|
||||
> print text=`name`,你明年 `next_age` 岁。
|
||||
```
|
||||
|
||||
|
||||
+19
-19
@@ -2,16 +2,16 @@
|
||||
|
||||
## 5.1 算术运算符
|
||||
|
||||
在 `*…*` 表达式内部:
|
||||
在 `**…**` 表达式内部:
|
||||
|
||||
```markdown
|
||||
*a = 10*
|
||||
*b = 3*
|
||||
**a = 10**
|
||||
**b = 3**
|
||||
|
||||
*sum = a + b* # 13
|
||||
*diff = a - b* # 7
|
||||
*prod = a * b* # 30
|
||||
*quo = a / b* # 3.33…(浮点除法)
|
||||
**sum = a + b** # 13
|
||||
**diff = a - b** # 7
|
||||
**prod = a * b** # 30
|
||||
**quo = a / b** # 3.33…(浮点除法)
|
||||
```
|
||||
|
||||
| 运算符 | 含义 |
|
||||
@@ -28,13 +28,13 @@
|
||||
`+` 也可以拼接字符串:
|
||||
|
||||
```markdown
|
||||
*first = "Hello, "*
|
||||
*second = "World!"*
|
||||
*msg = first + second*
|
||||
**first = "Hello, "**
|
||||
**second = "World!"**
|
||||
**msg = first + second**
|
||||
> print text=`msg` # Hello, World!
|
||||
```
|
||||
|
||||
> 在 `*…*` 内变量是裸名;若拼接的是字符串字面量,要加引号。
|
||||
> 在 `**…**` 内变量是裸名;若拼接的是字符串字面量,要加引号。
|
||||
|
||||
## 5.3 比较运算符
|
||||
|
||||
@@ -47,7 +47,7 @@
|
||||
| `<=` | 小于等于 |
|
||||
|
||||
```markdown
|
||||
*n = 5*
|
||||
**n = 5**
|
||||
|
||||
1. `n` > 3
|
||||
> print text=大于 3
|
||||
@@ -64,8 +64,8 @@
|
||||
| `not` | `非` | 逻辑非 |
|
||||
|
||||
```markdown
|
||||
*age = 20*
|
||||
*has_id = True*
|
||||
**age = 20**
|
||||
**has_id = True**
|
||||
|
||||
1. `age` >= 18 and `has_id`
|
||||
> print text=可以进入
|
||||
@@ -78,7 +78,7 @@
|
||||
布尔值字面量:`True` / `False`(中文 `真` / `假`)。
|
||||
|
||||
```markdown
|
||||
*is_admin = False*
|
||||
**is_admin = False**
|
||||
|
||||
1. `is_admin` == True
|
||||
> print text=管理员
|
||||
@@ -89,7 +89,7 @@
|
||||
也可以直接用布尔变量作条件:
|
||||
|
||||
```markdown
|
||||
*flag = True*
|
||||
**flag = True**
|
||||
|
||||
1. `flag`
|
||||
> print text=为真
|
||||
@@ -102,9 +102,9 @@
|
||||
```markdown
|
||||
# main
|
||||
|
||||
*score = 85*
|
||||
*passed = score >= 60*
|
||||
*bonus = passed and score >= 80*
|
||||
**score = 85**
|
||||
**passed = score >= 60**
|
||||
**bonus = passed and score >= 80**
|
||||
|
||||
> print text=及格:`passed`
|
||||
> print text=优秀:`bonus`
|
||||
|
||||
+33
-21
@@ -8,18 +8,18 @@
|
||||
## 加一
|
||||
+ `n`
|
||||
|
||||
**n + 1**
|
||||
*n + 1*
|
||||
```
|
||||
|
||||
- `## 加一` —— 函数名
|
||||
- `+ `n`` —— 参数
|
||||
- `**n + 1**` —— 返回值(**粗体 = 返回**)
|
||||
- `*n + 1*` —— 返回值(**斜体 = 返回**)
|
||||
|
||||
函数可以挂在 `# main` 之下作为嵌套函数,也可以作为顶层自由函数。
|
||||
|
||||
## 6.2 调用函数
|
||||
|
||||
使用 `>` 调用(具名参数或位置参数):
|
||||
使用 `>` 或粗体内调用(具名参数或位置参数):
|
||||
|
||||
```markdown
|
||||
# main
|
||||
@@ -32,7 +32,7 @@
|
||||
|
||||
> print text=Hello, `who`!
|
||||
|
||||
---
|
||||
*None*
|
||||
```
|
||||
|
||||
### 具名 vs 位置
|
||||
@@ -46,6 +46,17 @@
|
||||
|
||||
> 具名实参的值可以含空格,直到下一个 `名=` 边界;位置实参是单个词法单元(不含空格)。
|
||||
|
||||
### 方括号标记调用
|
||||
|
||||
可用 `[函数名]` 标出被调函数;`[` 前的裸词会变成布尔修饰(`名=True`):
|
||||
|
||||
```markdown
|
||||
> 问候 谁=小明 礼貌=True
|
||||
礼貌 [问候] 小明
|
||||
```
|
||||
|
||||
`]` 后**紧邻** `(` 是链接取元,不是调用(见[第 9 章](./09-集合.md))。
|
||||
|
||||
## 6.3 参数与默认值
|
||||
|
||||
可选参数用 `=默认值`:
|
||||
@@ -66,17 +77,18 @@
|
||||
```markdown
|
||||
> 问候 谁=小明
|
||||
> 问候 谁=小明 礼貌=True
|
||||
礼貌 [问候] 小明
|
||||
```
|
||||
|
||||
## 6.4 返回值:`**…**`
|
||||
## 6.4 返回值:`*…*`
|
||||
|
||||
用 `**…**` 返回表达式结果:
|
||||
用 `*…*` 返回表达式结果:
|
||||
|
||||
```markdown
|
||||
## 加一
|
||||
+ `n`
|
||||
|
||||
**n + 1**
|
||||
*n + 1*
|
||||
```
|
||||
|
||||
调用并绑定结果:
|
||||
@@ -84,19 +96,19 @@
|
||||
```markdown
|
||||
# main
|
||||
|
||||
*b = > 加一 n=1*
|
||||
**b = > 加一 n=1**
|
||||
> print text=`b` # 2
|
||||
```
|
||||
|
||||
### 返回 None:`****`
|
||||
### 返回 None
|
||||
|
||||
`****`(或空粗体 `**` + 空白 + `**`)返回 `None` 并结束函数体:
|
||||
推荐 `*None*` / `*无*`;也可整行空粗体 `**` 或 `****`:
|
||||
|
||||
```markdown
|
||||
## 静默
|
||||
+ `x`
|
||||
|
||||
****
|
||||
*None*
|
||||
```
|
||||
|
||||
### 字符串返回
|
||||
@@ -105,12 +117,12 @@
|
||||
## 问候语
|
||||
+ `谁`
|
||||
|
||||
**"你好," + 谁 + "!"**
|
||||
*"你好," + 谁 + "!"*
|
||||
```
|
||||
|
||||
## 6.5 结束函数体:`---` / `***`
|
||||
## 6.5 结束函数体
|
||||
|
||||
对于**没有返回值、只有副作用**的函数,用单独一行 `---` 或 `***` 结束函数体,避免后续兄弟语句被吞掉:
|
||||
副作用函数用斜体返回收束,避免后续兄弟语句被吞进本函数:
|
||||
|
||||
```markdown
|
||||
# main
|
||||
@@ -122,20 +134,20 @@
|
||||
|
||||
> print text=Hello, `谁`!
|
||||
|
||||
---
|
||||
*None*
|
||||
|
||||
## 下一个函数
|
||||
...
|
||||
```
|
||||
|
||||
> `---` 仅在**函数体顶层单独一行**时表示「结束本函数」;文件开头的成对 `---` 是 frontmatter,不会混淆。
|
||||
> 单独一行的 `---` / `***` 只是 Markdown 分隔线(跳过),**不再**表示结束函数体。文件开头的成对 `---` 仍是 frontmatter。
|
||||
|
||||
## 6.6 完整示例
|
||||
|
||||
```markdown
|
||||
# main
|
||||
|
||||
> 问候 谁=Alice 礼貌=True
|
||||
礼貌 [问候] Alice
|
||||
|
||||
## 问候
|
||||
+ `谁`
|
||||
@@ -146,12 +158,12 @@
|
||||
2. *
|
||||
> print text=嗨,`谁`!
|
||||
|
||||
---
|
||||
*None*
|
||||
|
||||
## 加一
|
||||
+ `n`
|
||||
|
||||
**n + 1**
|
||||
*n + 1*
|
||||
```
|
||||
|
||||
输出:
|
||||
@@ -172,13 +184,13 @@
|
||||
## 处理
|
||||
+ `名字`
|
||||
|
||||
*上 = > 大写 文本=`名字`*
|
||||
**上 = > 大写 文本=`名字`**
|
||||
> print text=`上`
|
||||
|
||||
### 大写
|
||||
+ `文本`
|
||||
|
||||
**> str `文本`**
|
||||
*> str `文本`*
|
||||
```
|
||||
|
||||
> 深度约定:`##` 是 `#` 的子级,`###` 是 `##` 的子级……按标题深度嵌套。
|
||||
|
||||
@@ -7,7 +7,7 @@ Marqdo 用**有序列表** `1.` `2.` `3.` … 表达条件分支:
|
||||
```markdown
|
||||
# main
|
||||
|
||||
*n = 5*
|
||||
**n = 5**
|
||||
|
||||
1. `n` > 0
|
||||
> print text=正数
|
||||
@@ -32,7 +32,7 @@ Marqdo 用**有序列表** `1.` `2.` `3.` … 表达条件分支:
|
||||
在 `1.` 之后的任意臂上,**整行恰为 `*`** 表示 else:
|
||||
|
||||
```markdown
|
||||
*age = 15*
|
||||
**age = 15**
|
||||
|
||||
1. `age` >= 18
|
||||
> print text=成年
|
||||
@@ -43,7 +43,7 @@ Marqdo 用**有序列表** `1.` `2.` `3.` … 表达条件分支:
|
||||
## 7.3 布尔分支
|
||||
|
||||
```markdown
|
||||
*is_admin = False*
|
||||
**is_admin = False**
|
||||
|
||||
1. `is_admin`
|
||||
> print text=管理员
|
||||
@@ -54,7 +54,7 @@ Marqdo 用**有序列表** `1.` `2.` `3.` … 表达条件分支:
|
||||
## 7.4 多条件分支
|
||||
|
||||
```markdown
|
||||
*score = 85*
|
||||
**score = 85**
|
||||
|
||||
1. `score` >= 90
|
||||
> print text=优秀
|
||||
@@ -69,8 +69,8 @@ Marqdo 用**有序列表** `1.` `2.` `3.` … 表达条件分支:
|
||||
## 7.5 逻辑组合条件
|
||||
|
||||
```markdown
|
||||
*age = 25*
|
||||
*has_id = True*
|
||||
**age = 25**
|
||||
**has_id = True**
|
||||
|
||||
1. `age` >= 18 and `has_id`
|
||||
> print text=可以进入
|
||||
@@ -85,8 +85,8 @@ Marqdo 用**有序列表** `1.` `2.` `3.` … 表达条件分支:
|
||||
```markdown
|
||||
# main
|
||||
|
||||
*a = True*
|
||||
*b = False*
|
||||
**a = True**
|
||||
**b = False**
|
||||
|
||||
1. `a`
|
||||
> print text=A 为真
|
||||
@@ -113,7 +113,7 @@ B 为假
|
||||
```markdown
|
||||
# main
|
||||
|
||||
*score = 72*
|
||||
**score = 72**
|
||||
|
||||
1. `score` >= 90
|
||||
> print text=评级:A
|
||||
|
||||
@@ -61,7 +61,7 @@ Marqdo 用 `-`(无序列表)表达循环。遍历列表用 `- [项](集合)`
|
||||
黄瓜
|
||||
```
|
||||
|
||||
> 遍历字典遍历的是键;要取值,用脚注取元(见[第 9 章](./09-集合.md))。
|
||||
> 遍历字典遍历的是键;要取值,用链接取元 `[键](集合)`(见[第 9 章](./09-集合.md))。
|
||||
|
||||
## 8.3 while 循环:`- 条件`
|
||||
|
||||
@@ -70,11 +70,11 @@ Marqdo 用 `-`(无序列表)表达循环。遍历列表用 `- [项](集合)`
|
||||
```markdown
|
||||
# main
|
||||
|
||||
*n = 3*
|
||||
**n = 3**
|
||||
|
||||
- `n` > 0
|
||||
> print text=`n`
|
||||
*n = n - 1*
|
||||
**n = n - 1**
|
||||
```
|
||||
|
||||
输出:
|
||||
@@ -85,7 +85,7 @@ Marqdo 用 `-`(无序列表)表达循环。遍历列表用 `- [项](集合)`
|
||||
1
|
||||
```
|
||||
|
||||
> 循环体内用 `*…*` 语句更新变量。
|
||||
> 循环体内用 `**…**` 语句更新变量。
|
||||
|
||||
## 8.4 嵌套循环
|
||||
|
||||
@@ -160,10 +160,10 @@ B2
|
||||
| 4 |
|
||||
| 5 |
|
||||
|
||||
*sum = 0*
|
||||
**sum = 0**
|
||||
|
||||
- [n](数字)
|
||||
*sum = sum + n*
|
||||
**sum = sum + n**
|
||||
|
||||
> print text=总和:`sum`
|
||||
```
|
||||
|
||||
+27
-26
@@ -14,7 +14,7 @@ Marqdo 用 **GFM 表格**直接构造数据集合。表格的**几何形状**决
|
||||
| 值 | 值 |
|
||||
```
|
||||
|
||||
表格绑定变量名**需要反引号**(不在 `*…*` 内)。
|
||||
表格绑定变量名**需要反引号**(不在粗体代码 `**…**` 内时)。
|
||||
|
||||
## 9.2 单列竖表 → 列表(List)
|
||||
|
||||
@@ -101,63 +101,64 @@ Marqdo 用 **GFM 表格**直接构造数据集合。表格的**几何形状**决
|
||||
| ≥2 列 + 0 行 | `Map`(键存在,值空列表) |
|
||||
| 首列 `@`/`行`/`row` | `List` of `Map`(行向记录) |
|
||||
|
||||
## 9.7 脚注取元:`[^…]`
|
||||
## 9.7 链接取元:`[键](集合)`
|
||||
|
||||
用 Markdown 脚注外形从集合取元素(**表达式级**,可链式)。
|
||||
主语法与 foreach 同形:**方括号 = 取出的名字,圆括号 = 从哪取**(见 [collection-access-link.md](../design/collection-access-link.md))。
|
||||
|
||||
### 从列表按下标取
|
||||
|
||||
**下标是 1-based**(与人类读表一致):
|
||||
|
||||
```markdown
|
||||
*第一 = 篮子[^1]*
|
||||
> print text=`第一` # 苹果
|
||||
**第一 = [1](篮子)**
|
||||
**打印 内容=`第一`**
|
||||
```
|
||||
|
||||
### 从字典按键取
|
||||
|
||||
```markdown
|
||||
*种 = 分类[^苹果]*
|
||||
> print text=`种` # 水果
|
||||
**种 = [苹果](分类)**
|
||||
**打印 内容=`种`**
|
||||
```
|
||||
|
||||
### 动态键
|
||||
|
||||
```markdown
|
||||
**名 = "拿铁"**
|
||||
**价 = [`名`](菜单)**
|
||||
```
|
||||
|
||||
### 嵌套取元
|
||||
|
||||
```markdown
|
||||
*第一种苹果 = 货架[^苹果][^1]* # 先键,再下标 → 红富士
|
||||
```
|
||||
|
||||
### 基名的反引号
|
||||
|
||||
`` 名[^键] `` 与 `` `名`[^键] `` 等价(紧跟 `[^` 时可省略反引号):
|
||||
|
||||
```markdown
|
||||
*种 = `分类`[^苹果]*
|
||||
**第一种苹果 = [1]([苹果](货架))**
|
||||
```
|
||||
|
||||
### 插值中的取元
|
||||
|
||||
在**调用实参值 / 引号字符串**里,`` `变量` `` 后**紧跟**(无空白)`[^…]` 时也按取元解析,而不必先绑定再输出:
|
||||
在**调用实参值 / 引号字符串**里也可以写链接取元(或过渡期的脚注形):
|
||||
|
||||
```markdown
|
||||
> print text=苹果单价:`水果价格`[^苹果] # 输出:苹果单价:5
|
||||
> print text=第一种:`货架`[^苹果][^1] # 链式取元 → 红富士
|
||||
> print text="价 `水果价格`[^香蕉] 元" # 引号字符串内也可取元 → 价 3 元
|
||||
> print text=苹果单价:[苹果](`水果价格`)
|
||||
> print text=第一种:[1]([苹果](`货架`))
|
||||
```
|
||||
|
||||
> 规则:`` `变量` [^…] ``(**有空白**)时 `[^…]` 仍是普通文本;只有 `` `变量`[^…] ``(无空白)才算取元。
|
||||
### 过渡:脚注取元 `` 集合[^键] ``
|
||||
|
||||
旧写法 `` 分类[^苹果] `` / `` `分类`[^苹果] `` **仍可解析**;新代码与教程示例请用链接形。脚注兼容金样见 `tests/structure/footnote*`。
|
||||
|
||||
> 规则:
|
||||
> - **List**:标签须为纯数字(1-based);`[^0]` 或越界 → 报错。
|
||||
> - **Map**:标签为键文本(含纯数字键,如 `[^00]`);缺键 → 报错。
|
||||
> - **List**:键须为纯数字(1-based);`[0](…)` 或越界 → 报错。
|
||||
> - **Map**:键为键文本;缺键 → 报错。
|
||||
> - 文末的 `[^1]: …` 定义块仍是注释,与取元无关。
|
||||
> - `]` 后**紧邻** `(` 才是取元;否则 `[名字]` 可能是[方括号标记调用](../design/bracket-call-modifiers.md)。
|
||||
|
||||
## 9.8 表格单元格是表达式
|
||||
|
||||
数据单元格支持表达式(与调用实参值语法相同):裸词、数字、`` `var` ``、算术、引号串。URL / `gpt-4o-mini` 等按路径/连字符折叠为文本。
|
||||
|
||||
```markdown
|
||||
*k = "secret"*
|
||||
**k = "secret"**
|
||||
|
||||
`cfg` =
|
||||
|
||||
@@ -177,7 +178,7 @@ Marqdo 用 **GFM 表格**直接构造数据集合。表格的**几何形状**决
|
||||
|------|------|
|
||||
| 5 | 3 |
|
||||
|
||||
> print text=苹果单价:`水果价格`[^苹果]
|
||||
**打印 内容="苹果单价:" + [苹果](水果价格)**
|
||||
|
||||
`购物单` =
|
||||
|
||||
@@ -187,7 +188,7 @@ Marqdo 用 **GFM 表格**直接构造数据集合。表格的**几何形状**决
|
||||
| 2 | 香蕉 | 3 |
|
||||
|
||||
- [行](购物单)
|
||||
> print text=`行`[^品名] × `行`[^数量]
|
||||
**打印 内容=[品名](行) + " × " + [数量](行)**
|
||||
```
|
||||
|
||||
输出:
|
||||
|
||||
+45
-45
@@ -10,13 +10,13 @@ Marqdo 用 `#` 标题定义**对象 / 类型**,用 `##` 定义其下的**方
|
||||
# 大模型
|
||||
+ `模型名`
|
||||
|
||||
*配置 = > json.parse text={"model":"gpt-4o-mini"}*
|
||||
**配置**
|
||||
**配置 = > json.parse text={"model":"gpt-4o-mini"}**
|
||||
*配置*
|
||||
```
|
||||
|
||||
- `# 大模型` —— 类型名
|
||||
- `+ `模型名`` —— 构造参数
|
||||
- 构造体执行后 `**…**` 返回一个 map,运行时写入 `_type` 字段,形成实例句柄
|
||||
- 构造体执行后 `*…*` 返回一个 map,运行时写入 `_type` 字段,形成实例句柄
|
||||
|
||||
## 10.2 构造实例
|
||||
|
||||
@@ -25,27 +25,27 @@ Marqdo 用 `#` 标题定义**对象 / 类型**,用 `##` 定义其下的**方
|
||||
```markdown
|
||||
# main
|
||||
|
||||
*模型 = > 大模型 模型名="gpt-4o-mini"*
|
||||
**模型 = > 大模型 模型名="gpt-4o-mini"**
|
||||
```
|
||||
|
||||
## 10.3 定义方法
|
||||
|
||||
对象下的 `##` 标题是方法:
|
||||
对象下的 `##` 标题是方法。读字段优先用链接取元;写字段可用 `json.set` / `table.put`(跨边界序列化时再用 `json.*`):
|
||||
|
||||
```markdown
|
||||
# 计数器
|
||||
+ `初始值`
|
||||
|
||||
*状态 = > json.parse text={"n":0}*
|
||||
*状态 = > json.set map=`状态` key="n" value=`初始值`*
|
||||
**状态**
|
||||
**状态 = > json.parse text={"n":0}**
|
||||
**状态 = > json.set map=`状态` key="n" value=`初始值`**
|
||||
*状态*
|
||||
|
||||
## 加一
|
||||
|
||||
*n = > json.get value=`self` key="n"*
|
||||
*n2 = n + 1*
|
||||
*t = > json.set map=`self` key="n" value=`n2`*
|
||||
**t**
|
||||
**n = [n](self)**
|
||||
**n2 = n + 1**
|
||||
**t = > json.set map=`self` key="n" value=`n2`**
|
||||
*t*
|
||||
```
|
||||
|
||||
方法体内自动绑定:
|
||||
@@ -60,18 +60,18 @@ Marqdo 用 `#` 标题定义**对象 / 类型**,用 `##` 定义其下的**方
|
||||
### 独立 `>` 调用(接收者加反引号)
|
||||
|
||||
```markdown
|
||||
*计数器 = > 计数器 初始值=3*
|
||||
*新值 = > `计数器`.加一*
|
||||
**计数器 = > 计数器 初始值=3**
|
||||
**新值 = > `计数器`.加一**
|
||||
```
|
||||
|
||||
### `*…*` 段内调用(接收者裸名)
|
||||
### 粗体代码段内调用(接收者裸名)
|
||||
|
||||
```markdown
|
||||
*计数器 = > 计数器 初始值=3*
|
||||
*新值 = > 计数器.加一*
|
||||
**计数器 = > 计数器 初始值=3**
|
||||
**新值 = > 计数器.加一**
|
||||
```
|
||||
|
||||
> **重要**:在 `*…*` / `**…**` 段内,裸词是变量,所以**方法接收者不加反引号**:`*新值 = > 计数器.加一*`。而在独立 `>` 调用中,裸词是文本,接收者需要反引号:`> `计数器`.加一`。
|
||||
> **重要**:在 `**…**` / `*…*` 段内,裸词是变量,所以**方法接收者不加反引号**:`**新值 = > 计数器.加一**`。而在独立 `>` 调用中,裸词是文本,接收者需要反引号:`` > `计数器`.加一 ``。
|
||||
|
||||
## 10.5 完整对象示例
|
||||
|
||||
@@ -84,27 +84,27 @@ import json:lib/json.mq.md
|
||||
|
||||
# main
|
||||
|
||||
*c = > 计数器 初始值=5*
|
||||
*ty = > json.get value=`c` key="_type"*
|
||||
**c = > 计数器 初始值=5**
|
||||
**ty = [_type](c)**
|
||||
> print text=类型:`ty`
|
||||
|
||||
*c2 = > c.加一*
|
||||
*n = > json.get value=`c2` key="n"*
|
||||
**c2 = > c.加一**
|
||||
**n = [n](c2)**
|
||||
> print text=加一后:`n`
|
||||
|
||||
# 计数器
|
||||
+ `初始值`
|
||||
|
||||
*状态 = > json.parse text={"n":0}*
|
||||
*状态 = > json.set map=`状态` key="n" value=`初始值`*
|
||||
**状态**
|
||||
**状态 = > json.parse text={"n":0}**
|
||||
**状态 = > json.set map=`状态` key="n" value=`初始值`**
|
||||
*状态*
|
||||
|
||||
## 加一
|
||||
|
||||
*n = > json.get value=`self` key="n"*
|
||||
*n2 = n + 1*
|
||||
*t = > json.set map=`self` key="n" value=`n2`*
|
||||
**t**
|
||||
**n = [n](self)**
|
||||
**n2 = n + 1**
|
||||
**t = > json.set map=`self` key="n" value=`n2`**
|
||||
*t*
|
||||
```
|
||||
|
||||
输出:
|
||||
@@ -122,16 +122,16 @@ import json:lib/json.mq.md
|
||||
## hello
|
||||
+ `who`
|
||||
|
||||
*msg = "Hello, `who`!"*
|
||||
**msg**
|
||||
**msg = "Hello, `who`!"**
|
||||
*msg*
|
||||
|
||||
# Loud = > Greeter
|
||||
|
||||
## hello
|
||||
+ `who`
|
||||
|
||||
*msg = "HELLO, `who`!"*
|
||||
**msg**
|
||||
**msg = "HELLO, `who`!"**
|
||||
*msg*
|
||||
```
|
||||
|
||||
规则:
|
||||
@@ -152,9 +152,9 @@ import json:lib/json.mq.md
|
||||
# Child = > Parent
|
||||
+ `name`
|
||||
|
||||
*self = > Parent name=`name`*
|
||||
*self = > json.set map=`self` key="role" value="child"*
|
||||
**self**
|
||||
**self = > Parent name=`name`**
|
||||
**self = > json.set map=`self` key="role" value="child"**
|
||||
*self*
|
||||
```
|
||||
|
||||
## 10.7 完整继承示例
|
||||
@@ -162,25 +162,25 @@ import json:lib/json.mq.md
|
||||
```markdown
|
||||
# main
|
||||
|
||||
*c = > Child name="Ada"*
|
||||
*ty = > json.get value=`c` key="_type"*
|
||||
*role = > json.get value=`c` key="role"*
|
||||
**c = > Child name="Ada"**
|
||||
**ty = [_type](c)**
|
||||
**role = [role](c)**
|
||||
> print text=`ty`
|
||||
> print text=`role`
|
||||
|
||||
# Parent
|
||||
+ `name`
|
||||
|
||||
*out = > json.parse text={"role":"parent"}*
|
||||
*out = > json.set map=`out` key="name" value=`name`*
|
||||
**out**
|
||||
**out = > json.parse text={"role":"parent"}**
|
||||
**out = > json.set map=`out` key="name" value=`name`**
|
||||
*out*
|
||||
|
||||
# Child = > Parent
|
||||
+ `name`
|
||||
|
||||
*self = > Parent name=`name`*
|
||||
*self = > json.set map=`self` key="role" value="child"*
|
||||
**self**
|
||||
**self = > Parent name=`name`**
|
||||
**self = > json.set map=`self` key="role" value="child"**
|
||||
*self*
|
||||
```
|
||||
|
||||
输出:
|
||||
|
||||
+12
-10
@@ -41,8 +41,8 @@ import json:lib/json.mq.md
|
||||
|
||||
# main
|
||||
|
||||
*t = > time.now_unix*
|
||||
*s = > time.format unix=`t` pattern="%Y-%m-%d"*
|
||||
**t = > time.now_unix**
|
||||
**s = > time.format unix=`t` pattern="%Y-%m-%d"**
|
||||
> print text=`s`
|
||||
```
|
||||
|
||||
@@ -60,7 +60,7 @@ import agent:ext/ai/agent.mq.md
|
||||
|
||||
# main
|
||||
|
||||
*助手 = > agent.agent model="gpt-4o-mini"* # 库 → 类型:构造
|
||||
**助手 = > agent.agent model="gpt-4o-mini"** # 库 → 类型:构造
|
||||
```
|
||||
|
||||
`agent.agent` —— `agent` 库中的 `agent` 类型(构造)。
|
||||
@@ -77,8 +77,8 @@ import fmt:time.format
|
||||
|
||||
# main
|
||||
|
||||
*t = > time.now_unix*
|
||||
*s = > fmt unix=`t` pattern="%Y-%m-%d"*
|
||||
**t = > time.now_unix**
|
||||
**s = > fmt unix=`t` pattern="%Y-%m-%d"**
|
||||
```
|
||||
|
||||
`fmt` 现在是 `time.format` 的短名。
|
||||
@@ -94,7 +94,7 @@ import fmt:time.format
|
||||
|------|------|
|
||||
| `time.parse` | 库路径(裸名,第一段非变量) |
|
||||
| `` > `助手`.step `` | 独立 `>` 调用:实例方法(接收者反引号) |
|
||||
| `*回复 = > 助手.step …*` | `*…*` 段内:`助手` 是变量 → 实例方法;否则 → 库路径 |
|
||||
| `**回复 = > 助手.step …**` | 粗体代码段内:`助手` 是变量 → 实例方法;否则 → 库路径 |
|
||||
|
||||
```markdown
|
||||
---
|
||||
@@ -103,8 +103,8 @@ import agent:ext/ai/agent.mq.md
|
||||
|
||||
# main
|
||||
|
||||
*助手 = > agent.agent model="gpt-4o-mini"*
|
||||
*out = > 助手.step task="你好"* # 助手是变量 → 方法调用
|
||||
**助手 = > agent.agent model="gpt-4o-mini"**
|
||||
**out = > 助手.step task="你好"** # 助手是变量 → 方法调用
|
||||
```
|
||||
|
||||
## 11.7 完整示例:多模块程序
|
||||
@@ -125,7 +125,7 @@ project/
|
||||
## 加倍
|
||||
+ `n`
|
||||
|
||||
**n * 2**
|
||||
*n * 2*
|
||||
```
|
||||
|
||||
`lib/问候.mq.md`:
|
||||
@@ -135,6 +135,8 @@ project/
|
||||
+ `谁`
|
||||
|
||||
> print text=你好,`谁`!
|
||||
|
||||
*None*
|
||||
```
|
||||
|
||||
`main.mq.md`:
|
||||
@@ -147,7 +149,7 @@ import 问候:lib/问候.mq.md
|
||||
|
||||
# main
|
||||
|
||||
*结果 = > 数学.加倍 n=21*
|
||||
**结果 = > 数学.加倍 n=21**
|
||||
> print text=`结果`
|
||||
|
||||
> 问候.你好 谁=世界
|
||||
|
||||
+12
-13
@@ -17,8 +17,8 @@ Marqdo 内置函数无需导入即可使用;更丰富的能力通过导入 `li
|
||||
|
||||
> print text=Hello
|
||||
|
||||
*s = "Marqdo"*
|
||||
*n = > len value=`s`*
|
||||
**s = "Marqdo"**
|
||||
**n = > len value=`s`**
|
||||
> print text=长度:`n`
|
||||
```
|
||||
|
||||
@@ -61,15 +61,15 @@ import json:lib/json.mq.md
|
||||
|
||||
# main
|
||||
|
||||
*obj = > json.parse text={"a":1}*
|
||||
*out = > json.stringify value=`obj`*
|
||||
**obj = > json.parse text={"a":1}**
|
||||
**out = > json.stringify value=`obj`**
|
||||
> print text=`out` # {"a":1}
|
||||
|
||||
*nl = > json.parse text={"n":"\n"}*
|
||||
> print text=第一行`nl`[^n]第二行 # 换行还原
|
||||
**nl = > json.parse text={"n":"\n"}**
|
||||
> print text=第一行[n](`nl`)第二行 # 换行还原
|
||||
```
|
||||
|
||||
> **字典操作**:本地字典的读取用脚注取元 `变量[^键]`,**不要**用 `json.get`。`json.get` / `json.set` 仅用于跨文本边界的序列化场景(例如与外部 JSON API 交换数据时)。构造字典用 GFM 横表(见[第 9 章](./09-集合.md))。
|
||||
> **字典操作**:本地字典的读取用链接取元 `[键](变量)`,**不要**用 `json.get`。`json.get` / `json.set` 仅用于跨文本边界的序列化场景(例如与外部 JSON API 交换数据时)。构造字典用 GFM 横表(见[第 9 章](./09-集合.md))。
|
||||
`json` 常用函数:
|
||||
|
||||
| 函数 | 作用 |
|
||||
@@ -90,10 +90,10 @@ import text:lib/text.mq.md
|
||||
|
||||
# main
|
||||
|
||||
*parts = > text.str_split s="a,b,c" sep=","*
|
||||
**parts = > text.str_split s="a,b,c" sep=","**
|
||||
> print text=`parts`
|
||||
|
||||
*joined = > text.str_join xs=`parts` sep="-"*
|
||||
**joined = > text.str_join xs=`parts` sep="-"**
|
||||
> print text=`joined` # a-b-c
|
||||
```
|
||||
|
||||
@@ -106,7 +106,7 @@ import math:lib/math.mq.md
|
||||
|
||||
# main
|
||||
|
||||
*值 = > math.num value=3.5*
|
||||
**值 = > math.num value=3.5**
|
||||
> print text=`值`
|
||||
```
|
||||
|
||||
@@ -124,7 +124,7 @@ $$
|
||||
x^2 - 2
|
||||
$$
|
||||
|
||||
*_svg = > math.plot formula=`f` var=x min=-3 max=3*
|
||||
**_svg = > math.plot formula=`f` var=x min=-3 max=3**
|
||||
```
|
||||
|
||||
空 RHS 赋值 + 后随 `$$…$$` 绑定一个公式值。
|
||||
@@ -150,9 +150,8 @@ import llm:ext/llm.mq.md
|
||||
|
||||
# main
|
||||
|
||||
*模型 = > llm.llm model="gpt-4o-mini"*
|
||||
**模型 = > llm.llm model="gpt-4o-mini"**
|
||||
```
|
||||
|
||||
| 扩展 | 功能 |
|
||||
|------|------|
|
||||
| `llm` | 大模型对话 |
|
||||
|
||||
+40
-40
@@ -31,30 +31,30 @@ import net:lib/net.mq.md
|
||||
|
||||
# main
|
||||
|
||||
*resp = > net.http_get url="https://api.example.com/status"*
|
||||
> print text=`resp`[^status]
|
||||
**resp = > net.http_get url="https://api.example.com/status"**
|
||||
> print text=[status](`resp`)
|
||||
```
|
||||
|
||||
`http_post` 默认以 JSON 提交,可用 `content_type=` / `headers=` 覆盖:
|
||||
|
||||
```markdown
|
||||
*body = > net.http_post url="https://api.example.com/echo" body={"msg":"hi"}*
|
||||
**body = > net.http_post url="https://api.example.com/echo" body={"msg":"hi"}**
|
||||
> print text=`body`
|
||||
```
|
||||
|
||||
> **字典操作**:返回值是字典(如 `resp`),直接取元 `resp[^键]`,不要用 `json.get`。
|
||||
> **字典操作**:返回值是字典(如 `resp`),用链接取元 `[键](resp)`,不要用 `json.get`。
|
||||
|
||||
### Cookie 解析
|
||||
|
||||
`cookie_parse` 把 `Cookie` 请求头或 `Set-Cookie` 响应头解析成列表:
|
||||
|
||||
```markdown
|
||||
*req = > net.cookie_parse text="session=abc123; theme=dark"*
|
||||
> print text=`req`[^1][^name] # session
|
||||
> print text=`req`[^1][^value] # abc123
|
||||
**req = > net.cookie_parse text="session=abc123; theme=dark"**
|
||||
> print text=[name]([1](`req`)) # session
|
||||
> print text=[value]([1](`req`)) # abc123
|
||||
|
||||
*resp = > net.cookie_parse text="id=42; Path=/; HttpOnly; SameSite=Lax" is_response=True*
|
||||
> print text=`resp`[^1][^http_only] # True
|
||||
**resp = > net.cookie_parse text="id=42; Path=/; HttpOnly; SameSite=Lax" is_response=True**
|
||||
> print text=[http_only]([1](`resp`)) # True
|
||||
```
|
||||
|
||||
### multipart 解析
|
||||
@@ -62,9 +62,9 @@ import net:lib/net.mq.md
|
||||
`multipart_parse` 解析 `multipart/form-data` 正文(给定 `boundary`):
|
||||
|
||||
```markdown
|
||||
*parts = > net.multipart_parse body=`body` boundary="----WebKitFormBoundary"*
|
||||
*field = parts[^1]*
|
||||
> print text=`field`[^name]
|
||||
**parts = > net.multipart_parse body=`body` boundary="----WebKitFormBoundary"**
|
||||
**field = [1](parts)**
|
||||
> print text=[name](`field`)
|
||||
```
|
||||
|
||||
## 14.3 网页应用(`ext/web`)
|
||||
@@ -86,17 +86,17 @@ import web:ext/web/web.mq.md
|
||||
|------|------|
|
||||
| nav.`导航` | shell.`顶栏` |
|
||||
|
||||
*page = > web.page title="我的站点" intro="<h1>你好</h1>"*
|
||||
*page = > `page`.compose_components components=`首页`*
|
||||
*html = > `page`.render*
|
||||
**page = > web.page title="我的站点" intro="<h1>你好</h1>"**
|
||||
**page = > `page`.compose_components components=`首页`**
|
||||
**html = > `page`.render**
|
||||
> print text=`html`
|
||||
```
|
||||
|
||||
### 应用 + 路由 + 监听
|
||||
|
||||
```markdown
|
||||
*app = > web.app page=`page` host=127.0.0.1 port=18081*
|
||||
*app = > `app`.route path="/about" page=`关于`*
|
||||
**app = > web.app page=`page` host=127.0.0.1 port=18081**
|
||||
**app = > `app`.route path="/about" page=`关于`**
|
||||
> web_listen app=`app`
|
||||
```
|
||||
|
||||
@@ -105,12 +105,12 @@ import web:ext/web/web.mq.md
|
||||
### 数据库(SQLite)
|
||||
|
||||
```markdown
|
||||
*store = > web.db url="sqlite:site.db"*
|
||||
**store = > web.db url="sqlite:site.db"**
|
||||
> `store`.init name=articles fields=`字段表`
|
||||
> `store`.insert table=articles rows=`数据`
|
||||
*rows = > `store`.select table=articles limit=10*
|
||||
**rows = > `store`.select table=articles limit=10**
|
||||
- [行](rows)
|
||||
> print text=`行`[^title]
|
||||
> print text=[title](`行`)
|
||||
```
|
||||
|
||||
## 14.4 登录鉴权(session / cookie)
|
||||
@@ -125,8 +125,8 @@ import web:ext/web/web.mq.md
|
||||
| 1 | admin | secret |
|
||||
| 2 | 站长 | pw123 |
|
||||
|
||||
*app = > web.app page=`page` admin=True*
|
||||
*app = > `app`.auth users=`管理员` session_ttl=3600*
|
||||
**app = > web.app page=`page` admin=True**
|
||||
**app = > `app`.auth users=`管理员` session_ttl=3600**
|
||||
> web_listen app=`app`
|
||||
```
|
||||
|
||||
@@ -135,16 +135,16 @@ import web:ext/web/web.mq.md
|
||||
**独立鉴权工具** `web.auth`:登录、校验、登出(不依赖页面),返回 `{ok, session_id, username}`:
|
||||
|
||||
```markdown
|
||||
*auth = > web.auth users=`管理员` session_ttl=3600*
|
||||
*login = > `auth`.login username="admin" password="secret"*
|
||||
1. `login`[^ok]
|
||||
> print text=登录成功:`login`[^username]
|
||||
**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 = login[^session_id]*
|
||||
*check = > `auth`.check session_id=`sid`*
|
||||
> print text=`check`[^username]
|
||||
**sid = [session_id](login)**
|
||||
**check = > `auth`.check session_id=`sid`**
|
||||
> print text=[username](`check`)
|
||||
|
||||
> `auth`.logout session_id=`sid`
|
||||
```
|
||||
@@ -154,24 +154,24 @@ import web:ext/web/web.mq.md
|
||||
`app.route_ws` 注册端点,`web.ws.connect` 单次请求–响应:
|
||||
|
||||
```markdown
|
||||
*app = > `app`.route_ws path="/live" echo=True*
|
||||
**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. `echo`[^ok]
|
||||
> print text=`echo`[^messages]
|
||||
**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=连接失败:`echo`[^error]
|
||||
> print text=连接失败:[error](`echo`)
|
||||
```
|
||||
|
||||
## 14.6 字典操作:用表格与取元,不用 `json.get`/`json.set`
|
||||
|
||||
Marqdo 用 **GFM 表格**构造字典、用 **脚注取元 `变量[^键]`** 读取字典——这是语言原生能力,是「代码即文档」的体现。**不要**用 `json.get` / `json.set` 读写本地字典(那只用于文本 ↔ 结构化的序列化,如 `json.parse` / `json.stringify`)。
|
||||
Marqdo 用 **GFM 表格**构造字典、用 **链接取元 `[键](变量)`** 读取字典——这是语言原生能力,是「代码即文档」的体现。**不要**用 `json.get` / `json.set` 读写本地字典(那只用于文本 ↔ 结构化的序列化,如 `json.parse` / `json.stringify`)。
|
||||
|
||||
构造字典(横表,≥2 列 + 1 行):
|
||||
|
||||
@@ -186,15 +186,15 @@ Marqdo 用 **GFM 表格**构造字典、用 **脚注取元 `变量[^键]`** 读
|
||||
读取字典(取元):
|
||||
|
||||
```markdown
|
||||
> print text=`配置`[^主机] # 127.0.0.1
|
||||
> print text=`配置`[^端口] # 18081
|
||||
> print text=[主机](`配置`) # 127.0.0.1
|
||||
> print text=[端口](`配置`) # 18081
|
||||
```
|
||||
|
||||
读取函数返回的字典字段,同样直接取元:
|
||||
|
||||
```markdown
|
||||
*login = > `auth`.login username="admin" password="secret"*
|
||||
> print text=`login`[^ok] # 而不是 json.get value=`login` key="ok"
|
||||
**login = > `auth`.login username="admin" password="secret"**
|
||||
> print text=[ok](`login`) # 而不是 json.get value=`login` key="ok"
|
||||
```
|
||||
|
||||
## 14.7 下一步
|
||||
|
||||
+16
-10
@@ -4,6 +4,8 @@
|
||||
|
||||
本教程面向所有读者——从没写过代码的文档作者,到熟悉 Python 的工程师。每章都配有可直接运行的完整示例。
|
||||
|
||||
**现行映射是 markup v0.3**:`**…**` = 代码(赋值 / 调用),`*…*` = 返回;集合取元优先 `[键](集合)`。
|
||||
|
||||
## 目录
|
||||
|
||||
### 第一部分 · 入门
|
||||
@@ -25,7 +27,7 @@
|
||||
|
||||
| 章节 | 内容 | 你能学会什么 |
|
||||
|------|------|-------------|
|
||||
| [第 6 章:函数](./06-函数.md) | 定义、参数、返回值、函数结束 | 封装可复用逻辑 |
|
||||
| [第 6 章:函数](./06-函数.md) | 定义、参数、返回值、括号调用 | 封装可复用逻辑 |
|
||||
| [第 7 章:条件分支](./07-条件分支.md) | `1.` `2.` 分支、else | 让程序根据条件走不同路线 |
|
||||
| [第 8 章:循环](./08-循环.md) | `-` 遍历、`-` while | 重复执行 |
|
||||
|
||||
@@ -33,7 +35,7 @@
|
||||
|
||||
| 章节 | 内容 | 你能学会什么 |
|
||||
|------|------|-------------|
|
||||
| [第 9 章:集合(表格)](./09-集合.md) | 列表、字典、记录、脚注取元 | 用 Markdown 表格组织数据 |
|
||||
| [第 9 章:集合(表格)](./09-集合.md) | 列表、字典、记录、链接取元 | 用 Markdown 表格组织数据 |
|
||||
|
||||
### 第五部分 · 面向对象与模块
|
||||
|
||||
@@ -59,27 +61,31 @@
|
||||
```markdown
|
||||
# main
|
||||
|
||||
> 问候 谁=World
|
||||
礼貌 [问候] World
|
||||
|
||||
## 问候
|
||||
+ `谁`
|
||||
+ `礼貌`=False
|
||||
|
||||
> print text=Hello, `谁`!
|
||||
1. `礼貌`
|
||||
> print text=您好,`谁`!
|
||||
2. *
|
||||
> print text=Hello, `谁`!
|
||||
|
||||
---
|
||||
*None*
|
||||
|
||||
## 加一
|
||||
+ `n`
|
||||
|
||||
**n + 1**
|
||||
*n + 1*
|
||||
```
|
||||
|
||||
- `# main` —— 入口
|
||||
- `> 问候 谁=World` —— 调用函数(具名参数)
|
||||
- `礼貌 [问候] World` —— 方括号标记调用(前导词 → `礼貌=True`)
|
||||
- `## 问候` + `+ `谁`` —— 定义函数及其参数
|
||||
- `> print text=…` —— 输出(副作用,是普通函数)
|
||||
- `**n + 1**` —— 返回值
|
||||
- 单独一行 `---` —— 结束函数体
|
||||
- `*n + 1*` —— 返回值(斜体)
|
||||
- `*None*` —— 无值收束并结束函数体
|
||||
|
||||
---
|
||||
|
||||
@@ -91,4 +97,4 @@ marqdo run 文件.mq.md
|
||||
|
||||
更多运行、浏览、调试、发布方式见 [第 13 章](./13-命令行工具.md)。
|
||||
|
||||
> **提示**:语法宪法与精确定义见 [`doc/design/markdown-mapping.md`](../design/markdown-mapping.md);本教程是它的通俗讲解版。
|
||||
> **提示**:语法宪法见 [`doc/design/markdown-mapping-v0.3.md`](../design/markdown-mapping-v0.3.md);本教程是它的通俗讲解版。
|
||||
@@ -13,7 +13,7 @@ import sys:lib/sys.mq.md
|
||||
|
||||
OKF flywheel offline: promote → plan same goal → `cache=hit` (no live LLM required for the hit path).
|
||||
|
||||
*p = > plugin.native_path name="agent"*
|
||||
**p = > plugin.native_path name="agent"**
|
||||
1. `p`
|
||||
> plugin.load path=`p`
|
||||
2. *
|
||||
@@ -21,14 +21,14 @@ OKF flywheel offline: promote → plan same goal → `cache=hit` (no live LLM re
|
||||
> sys.exit code=1
|
||||
|
||||
> sys.env_set name="OPENAI_API_KEY" value="offline-okf-dummy"
|
||||
*model = > llm.llm*
|
||||
*tools = > json.parse text=[]*
|
||||
*助手 = > agent.agent model=`model` tools=`tools` standing="offline okf flywheel"*
|
||||
**model = > llm.llm**
|
||||
**tools = > json.parse text=[]**
|
||||
**助手 = > agent.agent model=`model` tools=`tools` standing="offline okf flywheel"**
|
||||
|
||||
*kb = ".marqdo/agent-kb-example-flywheel"*
|
||||
*wb = ".marqdo/agent-runs/example-pong-solid.mq.md"*
|
||||
*goal = "Reply with exactly the word pong and nothing else."*
|
||||
*body = "---\ntitle: okf pong\n---\n\n# main\n\n*msg = \"pong\"*\n\n**msg**\n"*
|
||||
**kb = ".marqdo/agent-kb-example-flywheel"**
|
||||
**wb = ".marqdo/agent-runs/example-pong-solid.mq.md"**
|
||||
**goal = "Reply with exactly the word pong and nothing else."**
|
||||
**body = "---\ntitle: okf pong\n---\n\n# main\n\n*msg = \"pong\"*\n\n**msg**\n"**
|
||||
|
||||
1. > fs.exists path=`kb`
|
||||
> fs.remove path=`kb`
|
||||
@@ -37,20 +37,20 @@ OKF flywheel offline: promote → plan same goal → `cache=hit` (no live LLM re
|
||||
|
||||
> fs.write_text path=`wb` text=`body`
|
||||
|
||||
*prom = > agent_kb_promote kb_dir=`kb` goal=`goal` workbook=`wb`*
|
||||
*okp = > json.get value=`prom` key="promoted"*
|
||||
**prom = > agent_kb_promote kb_dir=`kb` goal=`goal` workbook=`wb`**
|
||||
**okp = > json.get value=`prom` key="promoted"**
|
||||
1. `okp`
|
||||
> print text=promoted
|
||||
2. *
|
||||
> print text=promote-fail
|
||||
> sys.exit code=1
|
||||
|
||||
*out = > `助手`.plan goal=`goal` max_rounds=2 writeback=False kb_dir=`kb` explore_n=0 promote=False*
|
||||
*cache = > json.get value=`out` key="cache"*
|
||||
**out = > `助手`.plan goal=`goal` max_rounds=2 writeback=False kb_dir=`kb` explore_n=0 promote=False**
|
||||
**cache = > json.get value=`out` key="cache"**
|
||||
> print text=`cache`
|
||||
*match = > json.get value=`out` key="match"*
|
||||
**match = > json.get value=`out` key="match"**
|
||||
> print text=`match`
|
||||
*val = > json.get value=`out` key="result"*
|
||||
**val = > json.get value=`out` key="result"**
|
||||
> print text=`val`
|
||||
|
||||
1. `cache` == "hit"
|
||||
|
||||
@@ -15,12 +15,12 @@ import time:lib/time.mq.md
|
||||
|
||||
Return today's date string (tool visible in source to the model).
|
||||
|
||||
*u = > time.now_unix*
|
||||
**> time.format unix=`u` pattern="%Y-%m-%d"**
|
||||
**u = > time.now_unix**
|
||||
*> time.format unix=`u` pattern="%Y-%m-%d"*
|
||||
|
||||
# main
|
||||
|
||||
*p = > plugin.native_path name="agent"*
|
||||
**p = > plugin.native_path name="agent"**
|
||||
1. `p`
|
||||
> plugin.load path=`p`
|
||||
2. *
|
||||
@@ -35,53 +35,53 @@ Return today's date string (tool visible in source to the model).
|
||||
|------|
|
||||
| 获取时间 |
|
||||
|
||||
*model = > llm.llm*
|
||||
*助手 = > agent.agent model=`model` tools=`工具表` standing="You are a Marqdo agent. Prefer CALL:获取时间 when the task needs today's date."*
|
||||
**model = > llm.llm**
|
||||
**助手 = > agent.agent model=`model` tools=`工具表` standing="You are a Marqdo agent. Prefer CALL:获取时间 when the task needs today's date."**
|
||||
|
||||
Assert constitution markers in the assembled prompt (call site before how-to-act):
|
||||
|
||||
*ctx = > agent.build_step_context agent=`助手` task="What is today's date? Use the tool in this runbook."*
|
||||
**ctx = > agent.build_step_context agent=`助手` task="What is today's date? Use the tool in this runbook."**
|
||||
|
||||
*parts = > split value=`ctx` sep="--- call site ---"*
|
||||
*n = > len value=`parts`*
|
||||
**parts = > split value=`ctx` sep="--- call site ---"**
|
||||
**n = > len value=`parts`**
|
||||
1. `n` > 1
|
||||
> print text=call-site-ok
|
||||
2. *
|
||||
> print text=call-site-missing
|
||||
> sys.exit code=1
|
||||
|
||||
*parts2 = > split value=`ctx` sep="--- source (.mq.md) ---"*
|
||||
*n2 = > len value=`parts2`*
|
||||
**parts2 = > split value=`ctx` sep="--- source (.mq.md) ---"**
|
||||
**n2 = > len value=`parts2`**
|
||||
1. `n2` > 1
|
||||
> print text=source-ok
|
||||
2. *
|
||||
> print text=source-missing
|
||||
> sys.exit code=1
|
||||
|
||||
*parts3 = > split value=`ctx` sep="获取时间"*
|
||||
*n3 = > len value=`parts3`*
|
||||
**parts3 = > split value=`ctx` sep="获取时间"**
|
||||
**n3 = > len value=`parts3`**
|
||||
1. `n3` > 1
|
||||
> print text=tool-in-source-ok
|
||||
2. *
|
||||
> print text=tool-in-source-missing
|
||||
> sys.exit code=1
|
||||
|
||||
*site = > agent_call_site*
|
||||
*fn = > json.get value=`site` key="function"*
|
||||
**site = > agent_call_site**
|
||||
**fn = > json.get value=`site` key="function"**
|
||||
> print text=`fn`
|
||||
|
||||
Optional live step — set env AGENT_LIVE=1 and put keys in repo-root `.env`:
|
||||
|
||||
*live = > sys.env_get name="AGENT_LIVE"*
|
||||
*key = > sys.env_get name="OPENAI_API_KEY"*
|
||||
**live = > sys.env_get name="AGENT_LIVE"**
|
||||
**key = > sys.env_get name="OPENAI_API_KEY"**
|
||||
1. `live` == "1"
|
||||
1. `key`
|
||||
*out = > `助手`.step task="请调用获取时间工具,然后只回复日期字符串。" writeback=False*
|
||||
*status = > json.get value=`out` key="status"*
|
||||
**out = > `助手`.step task="请调用获取时间工具,然后只回复日期字符串。" writeback=False**
|
||||
**status = > json.get value=`out` key="status"**
|
||||
> print text=`status`
|
||||
*tool = > json.get value=`out` key="tool"*
|
||||
**tool = > json.get value=`out` key="tool"**
|
||||
> print text=`tool`
|
||||
*result = > json.get value=`out` key="result"*
|
||||
**result = > json.get value=`out` key="result"**
|
||||
> print text=`result`
|
||||
2. *
|
||||
> print text=live-skipped-no-key
|
||||
|
||||
@@ -0,0 +1,45 @@
|
||||
# 暗恋见君 · Marqdo 重写
|
||||
|
||||
用 **Marqdo + `ext/web`(Go `libweb`)** 对齐 Django [anlian](../../../anlian/) 的主浏览路径与视觉:原站 CSS/JS、首页四段、列表/详情、发帖门禁、聊天室、专题、搜索入口、API 指南。
|
||||
|
||||
默认 **SQLite**(`data/anlian-mq.db`);生产可换 `postgres://` + Redis。
|
||||
|
||||
## 设计约定
|
||||
|
||||
| 做 | 不做 |
|
||||
|----|------|
|
||||
| GFM 表装配库表/种子/表单/门禁/头资源 | `json.set` 链拼页面 |
|
||||
| 原站 `public/css|js|img` + DOM class 对齐 | 另起一套模板糊弄验收 |
|
||||
| `页面.壳HTML` 挂 Django 级导航/页脚 | 业务写进 Go 插件 |
|
||||
| 缺能力时改 `ext/web` / `libweb` | 在应用层堆不可读胶水 |
|
||||
|
||||
## 路径(对齐原站)
|
||||
|
||||
| 路径 | 能力 |
|
||||
|------|------|
|
||||
| `/` | Hero + 公告 + 新闻时间线 + 论坛板块栏/卡片 |
|
||||
| `/post`、`/post/{slug}` | 帖子列表 / 详情 |
|
||||
| `/news`、`/news/{slug}` | 新闻列表 / 详情 |
|
||||
| `/post/public` | 发帖(需登录) |
|
||||
| `/post/ten`、`/news/five` | 首页 AJAX 片段 |
|
||||
| `/chat`、`/chat/lobby`、`/chat/casual` | 房间列表 + 公聊 WS |
|
||||
| `/topics` | 专题书架 |
|
||||
| `/search` | 搜索入口 |
|
||||
| `/guide/automation-api` | API 指南 |
|
||||
| `/accounts/login` | 粉玻璃登录 |
|
||||
| `/sitemap.xml`、`/robots.txt` | 站长 |
|
||||
|
||||
## 运行
|
||||
|
||||
```bash
|
||||
export PATH="$HOME/.local/go/bin:$PATH"
|
||||
./scripts/build-web-plugin.sh
|
||||
export MARQDO_WEB_PLUGIN=$PWD/plugins/web/build/libweb.so
|
||||
rm -f examples/anlian-mq/data/anlian-mq.db* # 首次或改 schema 后
|
||||
./target/debug/marqdo run examples/anlian-mq/index.mq.md
|
||||
# → http://127.0.0.1:18180/
|
||||
|
||||
bash examples/anlian-mq/smoke.sh
|
||||
```
|
||||
|
||||
默认账号:`admin` / `anlian`。
|
||||
@@ -0,0 +1,50 @@
|
||||
---
|
||||
title: components/chrome
|
||||
description: 暗恋见君壳层 — head 资源表、导航 HTML、页脚 HTML(对齐 Django base / site_footer)。
|
||||
---
|
||||
|
||||
## 头资源
|
||||
|
||||
首页与浏览页共用的 CSS / JS 链接表(挂到 `页面.头装配`)。路径对齐 `public/` 静态树。
|
||||
|
||||
`头` =
|
||||
|
||||
| 关系 | 地址 | 推迟 |
|
||||
|------|------|------|
|
||||
| stylesheet | "/static/vendor/bootstrap-anlian.min.css" | |
|
||||
| stylesheet | "/static/css/base.css" | |
|
||||
| stylesheet | "/static/css/navbar_search.css" | |
|
||||
| stylesheet | "/static/css/footer.css" | |
|
||||
| stylesheet | "/static/css/icons.css" | |
|
||||
| stylesheet | "/static/css/feed_common.css" | |
|
||||
| stylesheet | "/static/css/feed_list.css" | |
|
||||
| stylesheet | "/static/css/index.css" | |
|
||||
| stylesheet | "/static/css/index/hero.css" | |
|
||||
| stylesheet | "/static/css/index/notice.css" | |
|
||||
| stylesheet | "/static/css/index/home_news_timeline.css" | |
|
||||
| stylesheet | "/static/css/index/home_posts.css" | |
|
||||
| stylesheet | "/static/css/anlian_forms.css" | |
|
||||
| stylesheet | "/static/css/login.css" | |
|
||||
| stylesheet | "/static/css/rich_content.css" | |
|
||||
| stylesheet | "/static/css/detail_reading.css" | |
|
||||
| stylesheet | "/static/css/search.css" | |
|
||||
| stylesheet | "/static/css/chat.css" | |
|
||||
| stylesheet | "/static/css/topic_index.css" | |
|
||||
| script | "/static/vendor/bootstrap.bundle.min.js" | 真 |
|
||||
| script | "/static/js/anlian_partial.js" | 真 |
|
||||
| script | "/static/js/feed_board.js" | 真 |
|
||||
| script | "/static/js/index.js" | 真 |
|
||||
|
||||
*`头`*
|
||||
|
||||
## 导航HTML
|
||||
|
||||
对齐 Django `front/base.html` 顶栏:品牌「暗恋见君论坛」、主导航、搜索、登录/退出(`nav-when-guest` / `nav-when-auth` 由 CSS/JS 切换)。
|
||||
|
||||
**"<nav class=\"navbar navbar-expand-lg navbar-dark bg-dark\"><div class=\"container-fluid navbar-shell\"><div class=\"navbar-start\"><div class=\"navbar-logo\"><img src=\"/static/img/logo.svg\" alt=\"logo\" width=\"30\" height=\"30\" decoding=\"async\"></div><a class=\"navbar-brand\" href=\"/\">暗恋见君论坛</a></div><button class=\"navbar-toggler\" type=\"button\" data-bs-toggle=\"collapse\" data-bs-target=\"#navbarNav\" aria-controls=\"navbarNav\" aria-expanded=\"false\" aria-label=\"Toggle navigation\"><span class=\"navbar-toggler-icon\"></span></button><div class=\"collapse navbar-collapse\" id=\"navbarNav\"><ul class=\"navbar-nav navbar-nav-main\"><li class=\"nav-item\"><a class=\"nav-link\" href=\"/\">首页</a></li><li class=\"nav-item\"><a class=\"nav-link\" href=\"/post\">帖子</a></li><li class=\"nav-item\"><a class=\"nav-link\" href=\"/news\">新闻</a></li><li class=\"nav-item\"><a class=\"nav-link\" href=\"/topics\">专题</a></li><li class=\"nav-item\"><a class=\"nav-link\" href=\"/chat\">聊天</a></li><li class=\"nav-item\"><a class=\"nav-link\" href=\"/post/public\">发帖</a></li></ul><div class=\"navbar-end\"><form class=\"navbar-search d-flex\" action=\"/search\" method=\"get\" role=\"search\"><input class=\"form-control\" type=\"search\" name=\"q\" placeholder=\"搜索帖子、新闻、用户\" aria-label=\"搜索\" maxlength=\"100\" autocomplete=\"off\"><button class=\"btn btn-search-submit\" type=\"submit\">搜索</button></form><ul class=\"navbar-nav navbar-auth\"><li class=\"nav-item nav-when-guest\"><a class=\"nav-link nav-link-auth\" href=\"/accounts/login\">登录</a></li><li class=\"nav-item nav-when-auth\"><a class=\"nav-link nav-link-btn\" href=\"/admin/logout\">退出</a></li></ul></div></div></div></nav>"**
|
||||
|
||||
## 页脚HTML
|
||||
|
||||
对齐 `site_footer`:站点列 + 作者列;标语、版权、API 指南、作者 cflmy。
|
||||
|
||||
**"<footer class=\"site-footer\"><div class=\"site-footer-inner\"><div class=\"footer-col footer-col-site\"><img src=\"/static/img/logo.svg\" alt=\"\" class=\"footer-site-logo\" width=\"40\" height=\"40\" loading=\"lazy\"><p class=\"footer-site-name\">暗恋见君论坛</p><p class=\"footer-site-tagline\">期待人们能够继续相信爱情</p><p class=\"footer-copy\">© 2026 暗恋见君论坛</p><p class=\"footer-meta-sm footer-api-guide\"><a href=\"/guide/automation-api\" class=\"footer-guide-btn\" title=\"面向开发者的 API Key 与自动化对接说明\"><span class=\"anlian-icon anlian-icon--book\" aria-hidden=\"true\"><svg viewBox=\"0 0 24 24\" xmlns=\"http://www.w3.org/2000/svg\" focusable=\"false\" aria-hidden=\"true\"><path d=\"M6 2a2 2 0 0 0-2 2v16a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V4a2 2 0 0 0-2-2H6Zm0 2h5v7.5L8.5 10 6 11.5V4Zm7 0h5v16h-5V4Z\"/></svg></span> API 自动化指南</a></p></div><div class=\"footer-col footer-col-author\"><img src=\"/static/img/author_avatar-144.webp\" alt=\"\" class=\"footer-author-avatar\" width=\"72\" height=\"72\" loading=\"lazy\"><div class=\"footer-author-info\"><p class=\"footer-author-name\">cflmy</p><p class=\"footer-author-title\">站长</p></div></div></div></footer>"**
|
||||
@@ -0,0 +1,97 @@
|
||||
---
|
||||
title: components/feed
|
||||
description: 帖子列表 / 新闻时间线 / 板块栏 HTML 片段(对齐 Django feed 与 home 局部模板)。
|
||||
import table:lib/table.mq.md
|
||||
import text:lib/text.mq.md
|
||||
---
|
||||
|
||||
## 帖子列表HTML
|
||||
+ `行`
|
||||
|
||||
给定帖子行记录列表,输出 `ul.home-posts-list` 标记(首页与列表页共用)。
|
||||
|
||||
**段 = None**
|
||||
- [帖](行)
|
||||
**板 = [board](帖)**
|
||||
**题 = [title](帖)**
|
||||
**链 = [slug](帖)**
|
||||
**作 = [author](帖)**
|
||||
**评 = [comments_count](帖)**
|
||||
**时 = [created_at](帖)**
|
||||
1. not 作
|
||||
**作 = "匿名"**
|
||||
2. *
|
||||
1. not 评
|
||||
**评 = 0**
|
||||
2. *
|
||||
1. not 时
|
||||
**时 = ""**
|
||||
2. *
|
||||
**一项 = "<li><article class=\"home-post-card feed-post-card\"><a href=\"/post/" + 链 + "\" class=\"home-post-card-link feed-post-card-link\"><span class=\"home-post-board feed-post-board\">" + 板 + "</span><div class=\"home-post-body feed-post-body\"><h3 class=\"home-post-title feed-post-title\">" + 题 + "</h3><div class=\"home-post-meta feed-post-meta\"><span class=\"home-post-meta-item feed-post-meta-item\"><span class=\"anlian-icon anlian-icon--user\" aria-hidden=\"true\"></span> " + 作 + "</span><span class=\"home-post-meta-item feed-post-meta-item\"><span class=\"anlian-icon anlian-icon--comment\" aria-hidden=\"true\"></span> " + 评 + "</span><time>" + 时 + "</time></div></div><span class=\"home-post-arrow feed-post-arrow\" aria-hidden=\"true\"><span class=\"anlian-icon anlian-icon--chevron-right\"></span></span></a></article></li>"**
|
||||
**段 = > table.append list=段 item=一项**
|
||||
1. 段
|
||||
**内 = > text.str_join xs=段 sep=""**
|
||||
*"<ul class=\"home-posts-list feed-posts-list\">" + 内 + "</ul>"*
|
||||
2. *
|
||||
*"<ul class=\"home-posts-list feed-posts-list\"><li class=\"home-posts-empty feed-empty\">暂无帖子,<a href=\"/post/public\">去发帖</a></li></ul>"*
|
||||
|
||||
## 新闻时间线HTML
|
||||
+ `行`
|
||||
|
||||
给定新闻行记录列表,输出 `.news-timeline` 标记。
|
||||
|
||||
**段 = None**
|
||||
- [讯](行)
|
||||
**题 = [title](讯)**
|
||||
**链 = [slug](讯)**
|
||||
**板 = [board](讯)**
|
||||
**时 = [created_at](讯)**
|
||||
1. not 板
|
||||
**板 = ""**
|
||||
2. *
|
||||
1. not 时
|
||||
**时 = ""**
|
||||
2. *
|
||||
**一项 = "<li class=\"news-timeline-item\"><span class=\"news-timeline-node\" aria-hidden=\"true\"></span><article class=\"news-timeline-card\"><div class=\"news-timeline-meta\"><time class=\"news-timeline-date\">" + 时 + "</time><span class=\"news-timeline-board\">" + 板 + "</span></div><h3 class=\"news-timeline-title\"><a href=\"/news/" + 链 + "\" class=\"news-timeline-link\">" + 题 + "</a></h3></article></li>"**
|
||||
**段 = > table.append list=段 item=一项**
|
||||
1. 段
|
||||
**内 = > text.str_join xs=段 sep=""**
|
||||
*"<div class=\"news-timeline\"><div class=\"news-timeline-rail\" aria-hidden=\"true\"><span class=\"news-timeline-line\"></span><span class=\"news-timeline-arrow\" aria-hidden=\"true\"><span class=\"anlian-icon anlian-icon--chevron-right news-timeline-arrow-icon--right\"></span><span class=\"anlian-icon anlian-icon--chevron-down news-timeline-arrow-icon--down\"></span></span></div><ol class=\"news-timeline-items\">" + 内 + "</ol></div>"*
|
||||
2. *
|
||||
*"<div class=\"news-timeline\"><div class=\"news-timeline-rail\" aria-hidden=\"true\"><span class=\"news-timeline-line\"></span><span class=\"news-timeline-arrow\" aria-hidden=\"true\"></span></div><ol class=\"news-timeline-items\"><li class=\"news-timeline-item news-timeline-item-empty\"><article class=\"news-timeline-card\"><p class=\"news-timeline-empty\">暂无新闻</p></article></li></ol></div>"*
|
||||
|
||||
## 板块栏HTML
|
||||
+ `板块`
|
||||
+ `前缀`
|
||||
+ `查询键`
|
||||
+ `全部类`
|
||||
|
||||
板块 Tab 栏。`前缀` 如 `/post/ten/`;`查询键` 为 `board_id` 或 `news_board_id`;`全部类` 为 Tab 共用 class(含 js hook)。
|
||||
|
||||
**数据属 = "data-board"**
|
||||
**全标签 = "全部"**
|
||||
1. 查询键 == "news_board_id"
|
||||
**数据属 = "data-news-board"**
|
||||
**全标签 = "所有板块"**
|
||||
2. *
|
||||
|
||||
**段 = None**
|
||||
**全链 = 前缀 + "?" + 查询键 + "=0"**
|
||||
**全项 = "<a href=\"" + 全链 + "\" class=\"" + 全部类 + " active\" " + 数据属 + "=\"0\">" + 全标签 + "</a>"**
|
||||
**段 = > table.append list=段 item=全项**
|
||||
- [板](板块)
|
||||
**名 = [name](板)**
|
||||
**号 = [id](板)**
|
||||
**链 = 前缀 + "?" + 查询键 + "=" + 号**
|
||||
**项 = "<a href=\"" + 链 + "\" class=\"" + 全部类 + "\" " + 数据属 + "=\"" + 号 + "\">" + 名 + "</a>"**
|
||||
**段 = > table.append list=段 item=项**
|
||||
1. 查询键 == "news_board_id"
|
||||
**更多 = "<a href=\"/news\" class=\"home-posts-tab home-posts-tab-more\">全部新闻</a>"**
|
||||
**段 = > table.append list=段 item=更多**
|
||||
2. *
|
||||
**内 = > text.str_join xs=段 sep=""**
|
||||
**栏类 = "home-posts-board-bar"**
|
||||
1. 查询键 == "news_board_id"
|
||||
**栏类 = "home-posts-board-bar home-news-board-bar"**
|
||||
2. *
|
||||
*"<div class=\"" + 栏类 + "\" data-feed-board><button type=\"button\" class=\"home-posts-scroll home-posts-scroll-left\" aria-label=\"向左滚动\"><span class=\"anlian-icon anlian-icon--chevron-left\"></span></button><div class=\"home-posts-segment-outer\"><div class=\"home-posts-segment\"><div class=\"home-posts-spotlight\" aria-hidden=\"true\"></div><div class=\"home-posts-tabs-scroll\"><div class=\"home-posts-tabs\" role=\"tablist\">" + 内 + "</div></div></div></div><button type=\"button\" class=\"home-posts-scroll home-posts-scroll-right\" aria-label=\"向右滚动\"><span class=\"anlian-icon anlian-icon--chevron-right\"></span></button></div>"*
|
||||
@@ -0,0 +1,15 @@
|
||||
## 页脚
|
||||
|
||||
站点信息与站长链接(毛玻璃底由壳样式绘制)。
|
||||
|
||||
`页脚` =
|
||||
|
||||
| 属性 | 值 |
|
||||
|------|-----|
|
||||
| 暗恋见君 · 期待人们能够继续相信爱情 | / |
|
||||
| 帖子 | /posts |
|
||||
| 新闻 | /news |
|
||||
| 公聊 | /chat |
|
||||
| sitemap | /sitemap.xml |
|
||||
|
||||
*`页脚`*
|
||||
@@ -0,0 +1,21 @@
|
||||
---
|
||||
title: components/fragments
|
||||
description: AJAX 片段 — /post/ten、/news/five。
|
||||
导入 网页:ext/web/网页.mq.md
|
||||
import db:../db/index.mq.md
|
||||
import feed:feed.mq.md
|
||||
---
|
||||
|
||||
## 帖子十
|
||||
+ `board_id`="0"
|
||||
|
||||
**store = > db.打开**
|
||||
**行 = > store.查询 表="posts" 上限=10 排序="-created_at"**
|
||||
*> feed.帖子列表HTML 行=`行`*
|
||||
|
||||
## 新闻五
|
||||
+ `news_board_id`="0"
|
||||
|
||||
**store = > db.打开**
|
||||
**行 = > store.查询 表="news" 上限=5 排序="-created_at"**
|
||||
*> feed.新闻时间线HTML 行=`行`*
|
||||
@@ -0,0 +1,5 @@
|
||||
## 首页引言
|
||||
|
||||
英雄区 HTML(品牌标语 + CTA + 漂浮主图)。样式在 `styles/shell` 的 Hero / 动效表。
|
||||
|
||||
**"<section class=\"hero\" aria-label=\"暗恋见君\"><div class=\"hero-content\"><div class=\"hero-left\"><p class=\"hero-brand\"><img class=\"hero-logo\" src=\"/static/logo.svg\" alt=\"\" width=\"30\" height=\"30\"><span>暗恋<span class=\"hero-pink\">见君</span></span></p><h1 class=\"main-text\">期待人们能够继续相信<span class=\"hero-pink\">爱情</span></h1><p class=\"sub-text\">粉玻璃、呼吸 Logo、漂浮主图——用 Marqdo 表格装配的社区站点,验收「代码即文档」能否撑起真实前端。</p><p class=\"hero-cta\"><a class=\"hero-btn\" href=\"/posts\">浏览帖子</a><a class=\"hero-btn ghost\" href=\"/news\">新闻</a><a class=\"hero-btn ghost\" href=\"/chat\">公聊</a></p></div><div class=\"hero-right\"><img class=\"hero-art\" src=\"/static/bg-hero-640.webp\" alt=\"暗恋见君\"></div></div></section><div class=\"home-feed-head\"><h2>最新帖子</h2><p>来自粉玻璃卡片流</p></div>"**
|
||||
@@ -0,0 +1,47 @@
|
||||
---
|
||||
title: components/home_body
|
||||
description: 首页主体 HTML — hero + 公告 + 新闻时间线 + 论坛帖子(对齐 Django home.html,无外层导航)。
|
||||
导入 网页:ext/web/网页.mq.md
|
||||
import table:lib/table.mq.md
|
||||
import text:lib/text.mq.md
|
||||
import feed:feed.mq.md
|
||||
---
|
||||
|
||||
## 装配
|
||||
+ `库`
|
||||
|
||||
查询 notices / boards / news_boards / news(5) / posts(10),拼装首页四段 HTML(不含导航与页脚)。调用方传入已打开的 store。
|
||||
|
||||
**公告行 = > 库.查询 表="notices" 上限=20 排序="-created_at"**
|
||||
**板块行 = > 库.查询 表="boards" 上限=50**
|
||||
**新闻板块行 = > 库.查询 表="news_boards" 上限=50**
|
||||
**新闻行 = > 库.查询 表="news" 上限=5 排序="-created_at"**
|
||||
**帖子行 = > 库.查询 表="posts" 上限=10 排序="-created_at"**
|
||||
|
||||
**公告段 = None**
|
||||
- [告](公告行)
|
||||
**文 = [content](告)**
|
||||
**时 = [created_at](告)**
|
||||
**一项 = "<div class=\"notice-item\"><article class=\"notice-content\">" + 文 + "</article><p class=\"notice-create-time\">" + 时 + "</p></div>"**
|
||||
**公告段 = > table.append list=公告段 item=一项**
|
||||
1. 公告段
|
||||
**公告内 = > text.str_join xs=公告段 sep=""**
|
||||
2. *
|
||||
**公告内 = "<p class=\"text-muted\">暂无公告</p>"**
|
||||
|
||||
**新闻栏 = > feed.板块栏HTML 板块=新闻板块行 前缀="/news/five" 查询键="news_board_id" 全部类="home-posts-tab js-home-news-tab"**
|
||||
**新闻板 = > feed.新闻时间线HTML 行=新闻行**
|
||||
**帖子栏 = > feed.板块栏HTML 板块=板块行 前缀="/post/ten" 查询键="board_id" 全部类="home-posts-tab js-home-post-tab"**
|
||||
**帖子表 = > feed.帖子列表HTML 行=帖子行**
|
||||
|
||||
**段 = None**
|
||||
**英雄 = "<section class=\"hero\"><div class=\"section-wrap\"><header><img src=\"/static/img/logo.svg\" alt=\"logo\" width=\"30\" height=\"30\" decoding=\"async\"><a class=\"head-logo\" href=\"/\"><span>暗恋</span>见君</a></header><div class=\"hero-content\"><div class=\"left\"><h1 class=\"main-text\">期待人们能够继续相信<span style=\"color:#ffd0d0\">爱情</span></h1><h2 class=\"sub-text\">粉玻璃社区 · 匿名与实名同在</h2></div><div class=\"right\"><img src=\"/static/img/bg-hero-640.webp\" alt=\"首页展示图\" width=\"640\" height=\"482\" fetchpriority=\"high\" decoding=\"async\"></div></div><div class=\"social\"></div></div></section>"**
|
||||
**段 = > table.append list=段 item=英雄**
|
||||
**公告区 = "<section class=\"notice\"><div class=\"section-wrap\"><h2 class=\"notice-title\">公告信息</h2><div class=\"notice-content-container\"><div class=\"notice-list\">" + 公告内 + "</div></div></div></section>"**
|
||||
**段 = > table.append list=段 item=公告区**
|
||||
**新闻区 = "<section class=\"news home-news\" id=\"news\"><div class=\"section-wrap home-news-stage\"><h2 class=\"news-title\">新闻动态</h2>" + 新闻栏 + "<div class=\"news-timeline-wrap\"><div id=\"homeNewsPanel\" class=\"news-timeline-panel home-panel-swap\">" + 新闻板 + "</div></div></div></section>"**
|
||||
**段 = > table.append list=段 item=新闻区**
|
||||
**更多 = "<a href=\"/post\" class=\"home-posts-more-link\">查看更多帖子</a>"**
|
||||
**帖子区 = "<section class=\"home-posts\" id=\"post\"><div class=\"section-wrap home-posts-stage\"><h2 class=\"home-posts-title\">论坛交流</h2>" + 帖子栏 + "<div id=\"tenPostContainer\" class=\"home-posts-panel home-panel-swap\">" + 帖子表 + 更多 + "</div></div></section>"**
|
||||
**段 = > table.append list=段 item=帖子区**
|
||||
*> text.str_join xs=段 sep=""*
|
||||
@@ -0,0 +1,18 @@
|
||||
## 导航
|
||||
|
||||
顶栏:首页、帖子、新闻、搜索、聊天、发帖(登录后)、后台。
|
||||
|
||||
`导航` =
|
||||
|
||||
| 属性 | 值 | 样式 | 媒体 | 当 |
|
||||
|------|-----|------|------|-----|
|
||||
| 暗恋见君 | / | | | |
|
||||
| 帖子 | /posts | | | |
|
||||
| 新闻 | /news | | | |
|
||||
| 搜索 | /search | | | |
|
||||
| 聊天 | /chat | | | |
|
||||
| 发帖 | /write | | | auth |
|
||||
| 登录 | /admin/login | | | guest |
|
||||
| 后台 | /admin | | | auth |
|
||||
|
||||
*`导航`*
|
||||
@@ -0,0 +1,18 @@
|
||||
---
|
||||
title: components/page
|
||||
description: 用原站 chrome 包一层完整 HTML 引言(bare 布局)。
|
||||
import text:lib/text.mq.md
|
||||
import chrome:chrome.mq.md
|
||||
---
|
||||
|
||||
## 包装
|
||||
+ `正文`
|
||||
+ `体类`=""
|
||||
|
||||
导航 + 正文 + 页脚;体类如 `page-home`。
|
||||
|
||||
**顶 = > chrome.导航HTML**
|
||||
**底 = > chrome.页脚HTML**
|
||||
**鉴权脚本 = "<script>(function(){var c=document.cookie.indexOf('marqdo_sid=')>=0;document.querySelectorAll('.nav-when-guest').forEach(function(el){el.style.display=c?'none':'';});document.querySelectorAll('.nav-when-auth').forEach(function(el){el.style.display=c?'':'none';});})();</script>"**
|
||||
**鉴权样式 = "<style>.nav-when-auth{display:none}</style>"**
|
||||
*鉴权样式 + 顶 + "<main class=\"anlian-main " + 体类 + "\">" + 正文 + "</main>" + 底 + 鉴权脚本*
|
||||
@@ -0,0 +1,63 @@
|
||||
---
|
||||
title: db/index
|
||||
description: 打开库、建全表、幂等种子、帖子全文索引。
|
||||
导入 网页:ext/web/网页.mq.md
|
||||
import schema:schema.mq.md
|
||||
import seed:seed.mq.md
|
||||
---
|
||||
|
||||
## 打开
|
||||
|
||||
打开 sqlite:data/anlian-mq.db,初始化全部表;帖子建 FTS;若 posts 为空则写入种子。返回 store。
|
||||
|
||||
**store = > 网页.数据库 地址="sqlite:data/anlian-mq.db"**
|
||||
**帖子字段 = > schema.posts**
|
||||
**新闻字段 = > schema.news**
|
||||
**板块字段 = > schema.boards**
|
||||
**新闻板块字段 = > schema.news_boards**
|
||||
**公告字段 = > schema.notices**
|
||||
**评论字段 = > schema.comments**
|
||||
**房间字段 = > schema.chat_rooms**
|
||||
**专题字段 = > schema.topics**
|
||||
**密钥字段 = > schema.api_keys**
|
||||
> `store`.初始化 名=posts 字段=`帖子字段`
|
||||
> `store`.初始化 名=news 字段=`新闻字段`
|
||||
> `store`.初始化 名=boards 字段=`板块字段`
|
||||
> `store`.初始化 名=news_boards 字段=`新闻板块字段`
|
||||
> `store`.初始化 名=notices 字段=`公告字段`
|
||||
> `store`.初始化 名=comments 字段=`评论字段`
|
||||
> `store`.初始化 名=chat_rooms 字段=`房间字段`
|
||||
> `store`.初始化 名=topics 字段=`专题字段`
|
||||
> `store`.初始化 名=api_keys 字段=`密钥字段`
|
||||
|
||||
`全文列` =
|
||||
|
||||
| 列 |
|
||||
|----|
|
||||
| title |
|
||||
| summary |
|
||||
| body |
|
||||
|
||||
> `store`.全文 表=posts 列=`全文列` 名=posts_fts
|
||||
|
||||
**已有 = > store.查询 表="posts" 上限=1**
|
||||
1. `已有`
|
||||
*store*
|
||||
2. *
|
||||
**板块 = > seed.boards**
|
||||
**新闻板块 = > seed.news_boards**
|
||||
**帖子 = > seed.posts**
|
||||
**新闻 = > seed.news**
|
||||
**公告 = > seed.notices**
|
||||
**评论 = > seed.comments**
|
||||
**房间 = > seed.chat_rooms**
|
||||
**专题 = > seed.topics**
|
||||
> `store`.插入 表=boards 行=`板块`
|
||||
> `store`.插入 表=news_boards 行=`新闻板块`
|
||||
> `store`.插入 表=posts 行=`帖子`
|
||||
> `store`.插入 表=news 行=`新闻`
|
||||
> `store`.插入 表=notices 行=`公告`
|
||||
> `store`.插入 表=comments 行=`评论`
|
||||
> `store`.插入 表=chat_rooms 行=`房间`
|
||||
> `store`.插入 表=topics 行=`专题`
|
||||
*store*
|
||||
@@ -0,0 +1,146 @@
|
||||
## posts
|
||||
|
||||
帖子主表。`slug` 用于详情路径;`board` 为板块显示名,`board_id` 关联 `boards`。
|
||||
|
||||
`posts` =
|
||||
|
||||
| 字段 | 类型 | 可空 | 索引 |
|
||||
|------|------|------|------|
|
||||
| id | integer | false | |
|
||||
| title | text | false | |
|
||||
| slug | text | false | 是 |
|
||||
| summary | text | true | |
|
||||
| body | text | true | |
|
||||
| board | text | true | |
|
||||
| board_id | integer | true | |
|
||||
| author | text | true | |
|
||||
| comments_count | integer | true | |
|
||||
| views | integer | true | |
|
||||
| created_at | timestamp | true | |
|
||||
| updated_at | timestamp | true | |
|
||||
|
||||
*`posts`*
|
||||
|
||||
## news
|
||||
|
||||
新闻主表。`board_id` 关联 `news_boards`;`board` 为板块显示名。
|
||||
|
||||
`news` =
|
||||
|
||||
| 字段 | 类型 | 可空 | 索引 |
|
||||
|------|------|------|------|
|
||||
| id | integer | false | |
|
||||
| title | text | false | |
|
||||
| slug | text | false | 是 |
|
||||
| summary | text | true | |
|
||||
| body | text | true | |
|
||||
| board | text | true | |
|
||||
| board_id | integer | true | |
|
||||
| created_at | timestamp | true | |
|
||||
| updated_at | timestamp | true | |
|
||||
|
||||
*`news`*
|
||||
|
||||
## boards
|
||||
|
||||
帖子板块。
|
||||
|
||||
`boards` =
|
||||
|
||||
| 字段 | 类型 | 可空 | 索引 |
|
||||
|------|------|------|------|
|
||||
| id | integer | false | |
|
||||
| name | text | false | |
|
||||
| slug | text | false | 是 |
|
||||
|
||||
*`boards`*
|
||||
|
||||
## news_boards
|
||||
|
||||
新闻板块。
|
||||
|
||||
`news_boards` =
|
||||
|
||||
| 字段 | 类型 | 可空 | 索引 |
|
||||
|------|------|------|------|
|
||||
| id | integer | false | |
|
||||
| name | text | false | |
|
||||
| slug | text | false | 是 |
|
||||
|
||||
*`news_boards`*
|
||||
|
||||
## notices
|
||||
|
||||
首页公告。
|
||||
|
||||
`notices` =
|
||||
|
||||
| 字段 | 类型 | 可空 |
|
||||
|------|------|------|
|
||||
| id | integer | false |
|
||||
| content | text | false |
|
||||
| created_at | timestamp | true |
|
||||
|
||||
*`notices`*
|
||||
|
||||
## comments
|
||||
|
||||
评论(按目标类型 + slug 挂接)。
|
||||
|
||||
`comments` =
|
||||
|
||||
| 字段 | 类型 | 可空 |
|
||||
|------|------|------|
|
||||
| id | integer | false |
|
||||
| target_type | text | false |
|
||||
| target_slug | text | false |
|
||||
| body | text | false |
|
||||
| author | text | true |
|
||||
| created_at | timestamp | true |
|
||||
|
||||
*`comments`*
|
||||
|
||||
## chat_rooms
|
||||
|
||||
公聊房间。
|
||||
|
||||
`chat_rooms` =
|
||||
|
||||
| 字段 | 类型 | 可空 | 索引 |
|
||||
|------|------|------|------|
|
||||
| id | integer | false | |
|
||||
| slug | text | false | 是 |
|
||||
| name | text | false | |
|
||||
| summary | text | true | |
|
||||
|
||||
*`chat_rooms`*
|
||||
|
||||
## topics
|
||||
|
||||
专题占位。
|
||||
|
||||
`topics` =
|
||||
|
||||
| 字段 | 类型 | 可空 | 索引 |
|
||||
|------|------|------|------|
|
||||
| id | integer | false | |
|
||||
| slug | text | false | 是 |
|
||||
| title | text | false | |
|
||||
| summary | text | true | |
|
||||
|
||||
*`topics`*
|
||||
|
||||
## api_keys
|
||||
|
||||
API Key 校验用哈希表(应用层 scopes)。
|
||||
|
||||
`api_keys` =
|
||||
|
||||
| 字段 | 类型 | 可空 |
|
||||
|------|------|------|
|
||||
| id | integer | false |
|
||||
| name | text | false |
|
||||
| hash | text | false |
|
||||
| scopes | text | true |
|
||||
|
||||
*`api_keys`*
|
||||
@@ -0,0 +1,106 @@
|
||||
## boards
|
||||
|
||||
帖子板块:日常 / 开发 / 聊天。
|
||||
|
||||
`boards` =
|
||||
|
||||
| @ | name | slug |
|
||||
|---|------|------|
|
||||
| 1 | 日常 | daily |
|
||||
| 2 | 开发 | develop |
|
||||
| 3 | 聊天 | chat |
|
||||
|
||||
*`boards`*
|
||||
|
||||
## news_boards
|
||||
|
||||
新闻板块:站务 / 技术。
|
||||
|
||||
`news_boards` =
|
||||
|
||||
| @ | name | slug |
|
||||
|---|------|------|
|
||||
| 1 | 站务 | site |
|
||||
| 2 | 技术 | tech |
|
||||
|
||||
*`news_boards`*
|
||||
|
||||
## posts
|
||||
|
||||
种子帖子(标题/短链与原 anlian-mq 一致)。
|
||||
|
||||
`posts` =
|
||||
|
||||
| @ | title | slug | summary | body | board | board_id | author | comments_count | views |
|
||||
|---|-------|------|---------|------|-------|----------|--------|----------------|-------|
|
||||
| 1 | 欢迎来到暗恋见君 | welcome | 期待人们能够继续相信爱情。 | 这是用 Marqdo 重写的验收站点。页面、库表与门禁都用 GFM 表格装配——代码即文档。 | 日常 | 1 | 站务 | 2 | 42 |
|
||||
| 2 | 如何用表格写论坛 | tables-for-forums | 导航、表单、种子数据都是可读表格。 | 若某功能逼你写一长串 json.set,请先审视 ext/web 是否缺命名方法。 | 开发 | 2 | 站务 | 0 | 18 |
|
||||
| 3 | 公聊室已开放 | chat-open | WebSocket 广播房间。 | 打开 /chat,连上 /chat/ws,消息会扇出给同房间所有人。 | 聊天 | 3 | 站务 | 0 | 9 |
|
||||
|
||||
*`posts`*
|
||||
|
||||
## news
|
||||
|
||||
种子新闻。
|
||||
|
||||
`news` =
|
||||
|
||||
| @ | title | slug | summary | body | board | board_id |
|
||||
|---|-------|------|---------|------|-------|----------|
|
||||
| 1 | 站点迁往 Marqdo | migrate-to-marqdo | 原生层换 Go libweb,作者面保持表格。 | 暗恋见君的验收目标:登录、发帖、列表详情、聊天与站长工具都能用 .mq.md 写完。 | 站务 | 1 |
|
||||
| 2 | 外接 PostgreSQL / Redis | pg-redis | 生产可用外接驱动。 | 本示例默认 sqlite:;把数据库地址换成 postgres:// 即可。 | 技术 | 2 |
|
||||
|
||||
*`news`*
|
||||
|
||||
## notices
|
||||
|
||||
首页公告(2–3 条)。
|
||||
|
||||
`notices` =
|
||||
|
||||
| @ | content | created_at |
|
||||
|---|---------|------------|
|
||||
| 1 | 欢迎来到暗恋见君论坛。本站支持匿名与实名交流,请友善发言。 | 2026-09-01 10:00:00 |
|
||||
| 2 | 站点正用 Marqdo 表格重写验收:导航、首页四段、列表与公聊对齐原站 DOM。 | 2026-09-08 14:30:00 |
|
||||
| 3 | 发帖与评论请遵守社区规范;站务公告将在此置顶。 | 2026-09-10 09:00:00 |
|
||||
|
||||
*`notices`*
|
||||
|
||||
## comments
|
||||
|
||||
欢迎帖下的评论。
|
||||
|
||||
`comments` =
|
||||
|
||||
| @ | target_type | target_slug | body | author | created_at |
|
||||
|---|-------------|-------------|------|--------|------------|
|
||||
| 1 | post | welcome | 终于等到用表格写论坛的一天。 | 路人甲 | 2026-09-10 11:00:00 |
|
||||
| 2 | post | welcome | 期待人们能够继续相信爱情。 | 见君 | 2026-09-10 12:15:00 |
|
||||
|
||||
*`comments`*
|
||||
|
||||
## chat_rooms
|
||||
|
||||
公聊:大厅 + 闲聊。
|
||||
|
||||
`chat_rooms` =
|
||||
|
||||
| @ | slug | name | summary |
|
||||
|---|------|------|---------|
|
||||
| 1 | lobby | 大厅 | 全站公共聊天室。 |
|
||||
| 2 | casual | 闲聊 | 轻松闲聊,勿刷屏。 |
|
||||
|
||||
*`chat_rooms`*
|
||||
|
||||
## topics
|
||||
|
||||
专题占位条目。
|
||||
|
||||
`topics` =
|
||||
|
||||
| @ | slug | title | summary |
|
||||
|---|------|-------|---------|
|
||||
| 1 | glass-ui | 粉玻璃界面 | 首页与列表的毛玻璃视觉专题(占位)。 |
|
||||
| 2 | tables-as-code | 表格即代码 | Marqdo GFM 表装配专题(占位)。 |
|
||||
|
||||
*`topics`*
|
||||
@@ -0,0 +1,210 @@
|
||||
---
|
||||
title: 暗恋见君 · Marqdo
|
||||
description: 对齐 Django 暗恋见君:原站 CSS/DOM、首页四段、列表详情、发帖门禁、聊天室、专题、搜索、API 指南。
|
||||
导入 网页:ext/web/网页.mq.md
|
||||
import table:lib/table.mq.md
|
||||
import text:lib/text.mq.md
|
||||
import chrome:components/chrome.mq.md
|
||||
import page:components/page.mq.md
|
||||
import home:components/home_body.mq.md
|
||||
import feed:components/feed.mq.md
|
||||
import fragments:components/fragments.mq.md
|
||||
import db:db/index.mq.md
|
||||
---
|
||||
|
||||
# main
|
||||
|
||||
路径对齐原站:`/post`、`/news`、`/post/public`、`/chat`、`/topics`、`/search`、`/accounts/login`。
|
||||
|
||||
`用户表` =
|
||||
|
||||
| 行 | 用户名 | 密码 | 角色 |
|
||||
|----|--------|------|------|
|
||||
| 1 | admin | anlian | admin |
|
||||
|
||||
`发帖字段` =
|
||||
|
||||
| 字段 | 标签 | 类型 | 必填 |
|
||||
|------|------|------|------|
|
||||
| title | 标题 | text | true |
|
||||
| slug | 短链 | text | true |
|
||||
| summary | 摘要 | text | false |
|
||||
| body | 正文 | textarea | true |
|
||||
| board | 板块 | text | false |
|
||||
| board_id | 板块ID | number | false |
|
||||
| author | 署名 | text | false |
|
||||
|
||||
`发帖规则` =
|
||||
|
||||
| 字段 | 规则 | 消息 |
|
||||
|------|------|------|
|
||||
| title | required | 标题不能为空 |
|
||||
| slug | required | 需要短链 |
|
||||
| body | required | 正文不能为空 |
|
||||
|
||||
`帖子详情` =
|
||||
|
||||
| 属性 | 值 | 样式 |
|
||||
|------|-----|------|
|
||||
| title | posts.title | |
|
||||
| meta | posts.author | |
|
||||
| body | posts.body | |
|
||||
|
||||
`新闻详情` =
|
||||
|
||||
| 属性 | 值 | 样式 |
|
||||
|------|-----|------|
|
||||
| title | news.title | |
|
||||
| body | news.body | |
|
||||
|
||||
`帖子条件` =
|
||||
|
||||
| 字段 | 操作 | 值 |
|
||||
|------|------|-----|
|
||||
| slug | = | {slug} |
|
||||
|
||||
`新闻条件` =
|
||||
|
||||
| 字段 | 操作 | 值 |
|
||||
|------|------|-----|
|
||||
| slug | = | {slug} |
|
||||
|
||||
`地图项` =
|
||||
|
||||
| loc | 更新 |
|
||||
|-----|------|
|
||||
| / | 2026-09-10 |
|
||||
| /post | 2026-09-10 |
|
||||
| /news | 2026-09-10 |
|
||||
| /chat | 2026-09-10 |
|
||||
| /topics | 2026-09-10 |
|
||||
| /search | 2026-09-10 |
|
||||
| /guide/automation-api | 2026-09-10 |
|
||||
|
||||
`图标` =
|
||||
|
||||
| 路径 | 关系 | 类型 | 尺寸 | 地址 |
|
||||
|------|------|------|------|------|
|
||||
| "public/img/favicon-32.png" | icon | "image/png" | 32x32 | "/favicon.ico" |
|
||||
|
||||
**store = > db.打开**
|
||||
**头 = > chrome.头资源**
|
||||
**顶 = > chrome.导航HTML**
|
||||
**底 = > chrome.页脚HTML**
|
||||
**鉴权补丁 = "<style>.nav-when-auth{display:none}</style><script>(function(){var c=document.cookie.indexOf('marqdo_sid=')>=0;document.querySelectorAll('.nav-when-guest').forEach(function(el){el.style.display=c?'none':'';});document.querySelectorAll('.nav-when-auth').forEach(function(el){el.style.display=c?'':'none';});})();</script>"**
|
||||
|
||||
**主页体 = > home.装配 库=`store`**
|
||||
**主页文 = > page.包装 正文=`主页体` 体类="page-home"**
|
||||
**首页 = > 网页.页面 标题="暗恋见君论坛" 引言=`主页文` 壳样式="off" 布局="bare"**
|
||||
**首页 = > 首页.头装配 表=`头`**
|
||||
|
||||
**板块行 = > store.查询 表="boards" 上限=50**
|
||||
**帖子行 = > store.查询 表="posts" 上限=50 排序="-created_at"**
|
||||
**帖子栏 = > feed.板块栏HTML 板块=板块行 前缀="/post" 查询键="board_id" 全部类="feed-tab"**
|
||||
**帖子表 = > feed.帖子列表HTML 行=帖子行**
|
||||
**帖子列表体 = "<section class=\"feed-list-page\"><div class=\"section-wrap\"><h1 class=\"feed-list-title\">论坛交流</h1>" + 帖子栏 + 帖子表 + "<p style=\"margin-top:1rem\"><a href=\"/post/public\">发布帖子</a></p></div></section>"**
|
||||
**帖子列表文 = > page.包装 正文=`帖子列表体` 体类="page-post-list"**
|
||||
**帖子列表 = > 网页.页面 标题="帖子 · 暗恋见君" 引言=`帖子列表文` 壳样式="off" 布局="bare"**
|
||||
**帖子列表 = > 帖子列表.头装配 表=`头`**
|
||||
|
||||
**新闻板块行 = > store.查询 表="news_boards" 上限=50**
|
||||
**新闻行 = > store.查询 表="news" 上限=50 排序="-created_at"**
|
||||
**新闻栏 = > feed.板块栏HTML 板块=新闻板块行 前缀="/news" 查询键="news_board_id" 全部类="feed-tab"**
|
||||
**新闻表 = > feed.新闻时间线HTML 行=新闻行**
|
||||
**新闻列表体 = "<section class=\"feed-list-page home-news\"><div class=\"section-wrap\"><h1 class=\"feed-list-title\">新闻动态</h1>" + 新闻栏 + 新闻表 + "</div></section>"**
|
||||
**新闻列表文 = > page.包装 正文=`新闻列表体` 体类="page-news-list"**
|
||||
**新闻列表 = > 网页.页面 标题="新闻 · 暗恋见君" 引言=`新闻列表文` 壳样式="off" 布局="bare"**
|
||||
**新闻列表 = > 新闻列表.头装配 表=`头`**
|
||||
|
||||
**帖子页 = > 网页.页面 标题="帖子详情" 引言=`鉴权补丁` 壳样式="off" 布局="stacked"**
|
||||
**帖子页 = > 帖子页.头装配 表=`头`**
|
||||
**帖子页 = > 帖子页.壳HTML 导航=`顶` 页脚=`底` 体类="page-post-detail"**
|
||||
**帖子页 = > 帖子页.主体装配 主体=`帖子详情`**
|
||||
**帖子页 = > 帖子页.查询条件 条件=`帖子条件`**
|
||||
**帖子页 = > 帖子页.详情 详情=True**
|
||||
|
||||
**新闻页 = > 网页.页面 标题="新闻详情" 引言=`鉴权补丁` 壳样式="off" 布局="stacked"**
|
||||
**新闻页 = > 新闻页.头装配 表=`头`**
|
||||
**新闻页 = > 新闻页.壳HTML 导航=`顶` 页脚=`底` 体类="page-news-detail"**
|
||||
**新闻页 = > 新闻页.主体装配 主体=`新闻详情`**
|
||||
**新闻页 = > 新闻页.查询条件 条件=`新闻条件`**
|
||||
**新闻页 = > 新闻页.详情 详情=True**
|
||||
|
||||
**发帖表 = > 网页.表单 表="posts" 动作="插入"**
|
||||
**发帖表 = > 发帖表.字段 字段=`发帖字段`**
|
||||
**发帖表 = > 发帖表.规则 规则=`发帖规则`**
|
||||
**发帖引言 = > page.包装 正文="<section class=\"feed-list-page\"><div class=\"section-wrap\"><h1>发布帖子</h1><p>需登录(admin / anlian)</p></div></section>" 体类="page-post-public"**
|
||||
**发帖页 = > 网页.页面 标题="发帖 · 暗恋见君" 引言=`发帖引言` 壳样式="off" 布局="bare"**
|
||||
**发帖页 = > 发帖页.头装配 表=`头`**
|
||||
**发帖页 = > 发帖页.表单装配 id="post" 表单=`发帖表`**
|
||||
|
||||
**房间行 = > store.查询 表="chat_rooms" 上限=50**
|
||||
**房间段 = None**
|
||||
- [房](房间行)
|
||||
**名 = [name](房)**
|
||||
**链 = [slug](房)**
|
||||
**摘 = [summary](房)**
|
||||
**项 = "<article class=\"chat-room-card\"><h3><a href=\"/chat/" + 链 + "\">" + 名 + "</a></h3><p>" + 摘 + "</p></article>"**
|
||||
**房间段 = > table.append list=房间段 item=项**
|
||||
**房间内 = > text.str_join xs=房间段 sep=""**
|
||||
**聊天列表体 = "<section class=\"feed-list-page\"><div class=\"section-wrap\"><h1>聊天室</h1><div class=\"chat-room-grid\">" + 房间内 + "</div></div></section>"**
|
||||
**聊天列表文 = > page.包装 正文=`聊天列表体` 体类="page-chat"**
|
||||
**聊天列表 = > 网页.页面 标题="聊天 · 暗恋见君" 引言=`聊天列表文` 壳样式="off" 布局="bare"**
|
||||
**聊天列表 = > 聊天列表.头装配 表=`头`**
|
||||
|
||||
**大厅体 = "<section class=\"feed-list-page\"><div class=\"section-wrap\"><h1>大厅</h1><div class=\"chat-box\"><div id=\"chat-log\" class=\"chat-log\"></div><p class=\"search-bar\"><input id=\"chat-msg\" placeholder=\"说点什么…\" aria-label=\"消息\"><button id=\"chat-send\" type=\"button\">发送</button></p></div><script src=\"/static/chat.js\"></script></div></section>"**
|
||||
**大厅文 = > page.包装 正文=`大厅体` 体类="page-chat-room"**
|
||||
**大厅页 = > 网页.页面 标题="大厅 · 暗恋见君" 引言=`大厅文` 壳样式="off" 布局="bare"**
|
||||
**大厅页 = > 大厅页.头装配 表=`头`**
|
||||
|
||||
**闲聊体 = "<section class=\"feed-list-page\"><div class=\"section-wrap\"><h1>闲聊</h1><div class=\"chat-box\"><div id=\"chat-log\" class=\"chat-log\"></div><p class=\"search-bar\"><input id=\"chat-msg\" placeholder=\"说点什么…\" aria-label=\"消息\"><button id=\"chat-send\" type=\"button\">发送</button></p></div><script src=\"/static/chat.js\"></script></div></section>"**
|
||||
**闲聊文 = > page.包装 正文=`闲聊体` 体类="page-chat-room"**
|
||||
**闲聊页 = > 网页.页面 标题="闲聊 · 暗恋见君" 引言=`闲聊文` 壳样式="off" 布局="bare"**
|
||||
**闲聊页 = > 闲聊页.头装配 表=`头`**
|
||||
|
||||
**专题行 = > store.查询 表="topics" 上限=50**
|
||||
**专题段 = None**
|
||||
- [题](专题行)
|
||||
**题名 = [title](题)**
|
||||
**链 = [slug](题)**
|
||||
**摘 = [summary](题)**
|
||||
**项 = "<article class=\"topic-card\"><h3>" + 题名 + "</h3><p>" + 摘 + "</p><p class=\"text-muted\">slug: " + 链 + "</p></article>"**
|
||||
**专题段 = > table.append list=专题段 item=项**
|
||||
**专题内 = > text.str_join xs=专题段 sep=""**
|
||||
**专题体 = "<section class=\"feed-list-page\"><div class=\"section-wrap\"><h1>专题书架</h1><div class=\"topic-shelf\">" + 专题内 + "</div></div></section>"**
|
||||
**专题文 = > page.包装 正文=`专题体` 体类="page-topics"**
|
||||
**专题页 = > 网页.页面 标题="专题 · 暗恋见君" 引言=`专题文` 壳样式="off" 布局="bare"**
|
||||
**专题页 = > 专题页.头装配 表=`头`**
|
||||
|
||||
**搜索体 = "<section class=\"feed-list-page\"><div class=\"section-wrap\"><h1>搜索</h1><form class=\"search-bar\" method=\"get\" action=\"/search\"><input name=\"q\" placeholder=\"关键词\" aria-label=\"关键词\"><button type=\"submit\">搜</button></form><p class=\"text-muted\">全文检索走 SQLite FTS(posts_fts);结果面板后续可按 q 扩展。</p></div></section>"**
|
||||
**搜索文 = > page.包装 正文=`搜索体` 体类="page-search"**
|
||||
**搜索页 = > 网页.页面 标题="搜索 · 暗恋见君" 引言=`搜索文` 壳样式="off" 布局="bare"**
|
||||
**搜索页 = > 搜索页.头装配 表=`头`**
|
||||
|
||||
**指南体 = "<section class=\"feed-list-page\"><div class=\"section-wrap\"><h1>API 自动化指南</h1><p>使用 Bearer / X-Api-Key 调用自动化接口。本验收切片提供 <code>api_keys</code> 表与 <code>web_api_key_check</code> 原语;业务 scopes 写在 .mq.md。</p><pre>Authorization: Bearer <token></pre></div></section>"**
|
||||
**指南文 = > page.包装 正文=`指南体` 体类="page-guide"**
|
||||
**指南页 = > 网页.页面 标题="API 指南 · 暗恋见君" 引言=`指南文` 壳样式="off" 布局="bare"**
|
||||
**指南页 = > 指南页.头装配 表=`头`**
|
||||
|
||||
**应用 = > 网页.应用 页面=`首页` 数据库=`store` 后台=True 主机="127.0.0.1" 端口=18180**
|
||||
**应用 = > 应用.路由 路径="/post" 页面=`帖子列表`**
|
||||
**应用 = > 应用.路由 路径="/post/public" 页面=`发帖页`**
|
||||
**应用 = > 应用.路由 路径="/post/{slug}" 页面=`帖子页`**
|
||||
**应用 = > 应用.路由 路径="/news" 页面=`新闻列表`**
|
||||
**应用 = > 应用.路由 路径="/news/{slug}" 页面=`新闻页`**
|
||||
**应用 = > 应用.路由 路径="/chat" 页面=`聊天列表`**
|
||||
**应用 = > 应用.路由 路径="/chat/lobby" 页面=`大厅页`**
|
||||
**应用 = > 应用.路由 路径="/chat/casual" 页面=`闲聊页`**
|
||||
**应用 = > 应用.路由 路径="/topics" 页面=`专题页`**
|
||||
**应用 = > 应用.路由 路径="/search" 页面=`搜索页`**
|
||||
**应用 = > 应用.路由 路径="/guide/automation-api" 页面=`指南页`**
|
||||
**应用 = > 应用.静态 目录="public" 挂载="/static"**
|
||||
**应用 = > 应用.图标 表=`图标`**
|
||||
**应用 = > 应用.鉴权 用户表=`用户表` 会话时长=7200 登录路径="/accounts/login" 登录回跳="/post/public" 登出回跳="/"**
|
||||
**应用 = > 应用.门禁 路径="/post/public" 角色="admin" 匹配="prefix" 拒绝="redirect" 排除="/accounts/login"**
|
||||
**应用 = > 应用.路由实时 路径="/chat/ws" 模式="broadcast"**
|
||||
**应用 = > 应用.调用 路径="/post/ten" 方法="GET" 函数="fragments.帖子十" 正文="query" 返回="html"**
|
||||
**应用 = > 应用.调用 路径="/news/five" 方法="GET" 函数="fragments.新闻五" 正文="query" 返回="html"**
|
||||
**应用 = > 应用.站点地图 路径="/sitemap.xml" 基址="http://127.0.0.1:18180" 条目=`地图项`**
|
||||
**应用 = > 应用.爬虫协议 站点地图="http://127.0.0.1:18180/sitemap.xml"**
|
||||
> `应用`.监听
|
||||
@@ -0,0 +1,72 @@
|
||||
---
|
||||
title: anlian-mq offline smoke
|
||||
description: 不 listen:装配库表/页面/门禁/WS 路由袋,验证可读路径可构造。
|
||||
导入 网页:ext/web/网页.mq.md
|
||||
import shell:styles/shell.mq.md
|
||||
import nav:components/nav.mq.md
|
||||
import foot:components/foot.mq.md
|
||||
import db:db/index.mq.md
|
||||
import sys:lib/sys.mq.md
|
||||
---
|
||||
|
||||
# main
|
||||
|
||||
`壳` =
|
||||
|
||||
| 组件 | 样式 |
|
||||
|------|------|
|
||||
| nav.`导航` | |
|
||||
| foot.`页脚` | |
|
||||
|
||||
`帖子卡片` =
|
||||
|
||||
| 属性 | 值 |
|
||||
|------|-----|
|
||||
| title | posts.title |
|
||||
| body | posts.summary |
|
||||
| href | posts.slug |
|
||||
|
||||
`用户表` =
|
||||
|
||||
| 行 | 用户名 | 密码 | 角色 |
|
||||
|----|--------|------|------|
|
||||
| 1 | admin | anlian | admin |
|
||||
|
||||
**store = > db.打开**
|
||||
**壳CSS = > shell.全局**
|
||||
**首页 = > 网页.页面 标题="暗恋见君" 引言="<h1>ok</h1>"**
|
||||
**首页 = > 首页.组件装配 组件=`壳`**
|
||||
**首页 = > 首页.主体装配 主体=`帖子卡片`**
|
||||
**首页 = > 首页.样式 样式=`壳CSS`**
|
||||
|
||||
**应用 = > 网页.应用 页面=`首页` 数据库=`store` 后台=True 主机="127.0.0.1" 端口=18180**
|
||||
**应用 = > 应用.鉴权 用户表=`用户表`**
|
||||
**应用 = > 应用.门禁 路径="/write" 角色="admin" 匹配="prefix" 拒绝="redirect"**
|
||||
**应用 = > 应用.路由实时 路径="/chat/ws" 模式="broadcast"**
|
||||
|
||||
**gates = [gates](应用)**
|
||||
**n = > len value=`gates`**
|
||||
1. `n` >= 2
|
||||
> print text=gates-ok
|
||||
2. *
|
||||
> print text=gates-fail
|
||||
> sys.exit code=1
|
||||
|
||||
**ws = [ws_routes](应用)**
|
||||
**room = [/chat/ws](ws)**
|
||||
**mode = [mode](room)**
|
||||
1. `mode` == "broadcast"
|
||||
> print text=ws-ok
|
||||
2. *
|
||||
> print text=ws-fail
|
||||
> sys.exit code=1
|
||||
|
||||
**list = > store.查询 表="posts" 上限=10**
|
||||
**nr = > len value=`list`**
|
||||
1. `nr` >= 1
|
||||
> print text=seed-ok
|
||||
2. *
|
||||
> print text=seed-fail
|
||||
> sys.exit code=1
|
||||
|
||||
> print text=anlian-offline-ok
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 76 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 45 KiB |
@@ -0,0 +1,37 @@
|
||||
/* 公聊客户端:保持极薄;业务配置仍在 .mq.md 表格里。 */
|
||||
(function () {
|
||||
var log = document.getElementById("chat-log");
|
||||
var input = document.getElementById("chat-msg");
|
||||
var send = document.getElementById("chat-send");
|
||||
if (!log || !input || !send) return;
|
||||
|
||||
var proto = location.protocol === "https:" ? "wss:" : "ws:";
|
||||
var ws = new WebSocket(proto + "//" + location.host + "/chat/ws");
|
||||
|
||||
function line(text) {
|
||||
log.textContent += text + "\n";
|
||||
log.scrollTop = log.scrollHeight;
|
||||
}
|
||||
|
||||
ws.onopen = function () {
|
||||
line("[已连接公聊室]");
|
||||
};
|
||||
ws.onclose = function () {
|
||||
line("[连接关闭]");
|
||||
};
|
||||
ws.onmessage = function (ev) {
|
||||
line(String(ev.data));
|
||||
};
|
||||
|
||||
function publish() {
|
||||
var t = (input.value || "").trim();
|
||||
if (!t || ws.readyState !== 1) return;
|
||||
ws.send(t);
|
||||
input.value = "";
|
||||
}
|
||||
|
||||
send.addEventListener("click", publish);
|
||||
input.addEventListener("keydown", function (e) {
|
||||
if (e.key === "Enter") publish();
|
||||
});
|
||||
})();
|
||||
@@ -0,0 +1,454 @@
|
||||
/**
|
||||
* 暗恋见君 — 登录/注册/发帖/评论 共用表单样式(粉色毛玻璃主题)
|
||||
*/
|
||||
|
||||
:root {
|
||||
--anlian-accent: #fdbbdb;
|
||||
--anlian-accent-deep: #f0a8c4;
|
||||
--anlian-accent-text: #a85878;
|
||||
--anlian-accent-muted: #c97a96;
|
||||
--anlian-glass-bg: rgba(255, 255, 255, 0.38);
|
||||
--anlian-glass-border: rgba(255, 255, 255, 0.52);
|
||||
--anlian-text: #222;
|
||||
--anlian-text-muted: #666;
|
||||
--anlian-radius: 14px;
|
||||
--anlian-radius-pill: 999px;
|
||||
--anlian-transition: 0.2s ease;
|
||||
}
|
||||
|
||||
/* ---------- 页面布局 ---------- */
|
||||
.anlian-page {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
align-items: center;
|
||||
width: 100%;
|
||||
max-width: 520px;
|
||||
margin: 0 auto;
|
||||
padding: 1.5rem 1rem 2.5rem;
|
||||
box-sizing: border-box;
|
||||
}
|
||||
|
||||
.anlian-page-wide {
|
||||
max-width: 800px;
|
||||
}
|
||||
|
||||
.anlian-page-title {
|
||||
margin: 0 0 1.25rem;
|
||||
font-size: 1.75rem;
|
||||
font-weight: 700;
|
||||
color: var(--anlian-text);
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
.anlian-page-lead {
|
||||
margin: -0.5rem 0 1.25rem;
|
||||
font-size: 0.9rem;
|
||||
color: var(--anlian-text-muted);
|
||||
text-align: center;
|
||||
line-height: 1.5;
|
||||
}
|
||||
|
||||
/* ---------- 表单卡片 ---------- */
|
||||
.anlian-form-card {
|
||||
width: 100%;
|
||||
padding: 2rem 1.75rem;
|
||||
border-radius: 24px;
|
||||
background: var(--anlian-glass-bg);
|
||||
backdrop-filter: blur(18px);
|
||||
-webkit-backdrop-filter: blur(18px);
|
||||
border: 1px solid var(--anlian-glass-border);
|
||||
box-shadow: 0 12px 40px rgba(253, 189, 219, 0.15);
|
||||
box-sizing: border-box;
|
||||
}
|
||||
|
||||
.anlian-form-card .form-group,
|
||||
.anlian-form-card .anlian-field {
|
||||
margin-bottom: 1.25rem;
|
||||
}
|
||||
|
||||
.anlian-form-card .anlian-field:last-child,
|
||||
.anlian-form-card .form-group:last-of-type {
|
||||
margin-bottom: 0;
|
||||
}
|
||||
|
||||
/* ---------- 标签与输入框 ---------- */
|
||||
.anlian-field-label,
|
||||
.anlian-form-card label:not(.anlian-pill-label):not(.anlian-switch) {
|
||||
display: block;
|
||||
margin-bottom: 0.45rem;
|
||||
font-size: 0.875rem;
|
||||
font-weight: 600;
|
||||
color: var(--anlian-accent-text);
|
||||
}
|
||||
|
||||
.anlian-form-card input[type="text"],
|
||||
.anlian-form-card input[type="email"],
|
||||
.anlian-form-card input[type="password"],
|
||||
.anlian-form-card input[type="search"],
|
||||
.anlian-form-card input[type="number"],
|
||||
.anlian-form-card input.anlian-input,
|
||||
.anlian-form-card .form-control,
|
||||
.anlian-form-card textarea,
|
||||
.anlian-form-card select {
|
||||
display: block;
|
||||
width: 100%;
|
||||
box-sizing: border-box;
|
||||
padding: 0.7rem 0.95rem;
|
||||
font-size: 1rem;
|
||||
line-height: 1.4;
|
||||
color: var(--anlian-text);
|
||||
background: rgba(255, 255, 255, 0.55);
|
||||
border: 1px solid rgba(253, 189, 219, 0.35);
|
||||
border-radius: 12px;
|
||||
transition: border-color var(--anlian-transition), box-shadow var(--anlian-transition),
|
||||
background var(--anlian-transition);
|
||||
}
|
||||
|
||||
.anlian-form-card input::placeholder,
|
||||
.anlian-form-card textarea::placeholder {
|
||||
color: #999;
|
||||
}
|
||||
|
||||
.anlian-form-card input:focus,
|
||||
.anlian-form-card textarea:focus,
|
||||
.anlian-form-card select:focus {
|
||||
outline: none;
|
||||
border-color: var(--anlian-accent-deep);
|
||||
background: rgba(255, 255, 255, 0.72);
|
||||
box-shadow: 0 0 0 3px rgba(253, 189, 219, 0.28);
|
||||
}
|
||||
|
||||
.anlian-form-card select {
|
||||
cursor: pointer;
|
||||
appearance: none;
|
||||
background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='12' height='8' viewBox='0 0 12 8'%3E%3Cpath fill='%23a85878' d='M6 8 0 0h12z'/%3E%3C/svg%3E");
|
||||
background-repeat: no-repeat;
|
||||
background-position: right 0.95rem center;
|
||||
padding-right: 2.25rem;
|
||||
}
|
||||
|
||||
.anlian-form-card textarea {
|
||||
min-height: 100px;
|
||||
resize: vertical;
|
||||
}
|
||||
|
||||
/* ---------- 记住我(自定义勾选,替代原生 checkbox) ---------- */
|
||||
.anlian-field-remember {
|
||||
margin-bottom: 1.25rem;
|
||||
}
|
||||
|
||||
.anlian-switch {
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
gap: 0.65rem;
|
||||
cursor: pointer;
|
||||
user-select: none;
|
||||
}
|
||||
|
||||
.anlian-switch-input {
|
||||
position: absolute;
|
||||
width: 1px;
|
||||
height: 1px;
|
||||
padding: 0;
|
||||
margin: -1px;
|
||||
overflow: hidden;
|
||||
clip: rect(0, 0, 0, 0);
|
||||
white-space: nowrap;
|
||||
border: 0;
|
||||
}
|
||||
|
||||
.anlian-switch-box {
|
||||
position: relative;
|
||||
flex-shrink: 0;
|
||||
width: 1.35rem;
|
||||
height: 1.35rem;
|
||||
border-radius: 8px;
|
||||
background: rgba(255, 255, 255, 0.5);
|
||||
border: 1px solid rgba(253, 189, 219, 0.5);
|
||||
box-shadow: inset 0 1px 2px rgba(255, 255, 255, 0.4);
|
||||
transition: background var(--anlian-transition), border-color var(--anlian-transition),
|
||||
box-shadow var(--anlian-transition);
|
||||
}
|
||||
|
||||
.anlian-switch-box::after {
|
||||
content: '';
|
||||
position: absolute;
|
||||
left: 50%;
|
||||
top: 45%;
|
||||
width: 0.3rem;
|
||||
height: 0.55rem;
|
||||
margin-left: -0.2rem;
|
||||
margin-top: -0.38rem;
|
||||
border: solid #fff;
|
||||
border-width: 0 2px 2px 0;
|
||||
transform: rotate(45deg) scale(0);
|
||||
opacity: 0;
|
||||
transition: transform 0.15s ease, opacity 0.15s ease;
|
||||
}
|
||||
|
||||
.anlian-switch-input:checked + .anlian-switch-box {
|
||||
background: linear-gradient(135deg, rgba(253, 189, 219, 0.85), rgba(240, 168, 196, 0.9));
|
||||
border-color: rgba(240, 168, 196, 0.85);
|
||||
box-shadow: 0 2px 8px rgba(253, 189, 219, 0.35);
|
||||
}
|
||||
|
||||
.anlian-switch-input:checked + .anlian-switch-box::after {
|
||||
transform: rotate(45deg) scale(1);
|
||||
opacity: 1;
|
||||
}
|
||||
|
||||
.anlian-switch-input:focus-visible + .anlian-switch-box {
|
||||
outline: none;
|
||||
box-shadow: 0 0 0 3px rgba(253, 189, 219, 0.35);
|
||||
}
|
||||
|
||||
.anlian-switch-text {
|
||||
font-size: 0.875rem;
|
||||
font-weight: 500;
|
||||
color: var(--anlian-accent-text);
|
||||
line-height: 1.3;
|
||||
}
|
||||
|
||||
.anlian-switch:hover .anlian-switch-box {
|
||||
border-color: var(--anlian-accent-deep);
|
||||
background: rgba(255, 255, 255, 0.62);
|
||||
}
|
||||
|
||||
.anlian-switch:hover .anlian-switch-input:checked + .anlian-switch-box {
|
||||
background: linear-gradient(135deg, rgba(253, 189, 219, 0.95), rgba(240, 168, 196, 0.95));
|
||||
}
|
||||
|
||||
/* ---------- 匿名:分段切换 ---------- */
|
||||
.anlian-field-anon {
|
||||
margin-top: 0.25rem;
|
||||
}
|
||||
|
||||
.anlian-pill-toggle {
|
||||
position: relative;
|
||||
}
|
||||
|
||||
.anlian-pill-input {
|
||||
position: absolute;
|
||||
width: 1px;
|
||||
height: 1px;
|
||||
padding: 0;
|
||||
margin: -1px;
|
||||
overflow: hidden;
|
||||
clip: rect(0, 0, 0, 0);
|
||||
white-space: nowrap;
|
||||
border: 0;
|
||||
}
|
||||
|
||||
.anlian-pill-label {
|
||||
position: relative;
|
||||
display: grid;
|
||||
grid-template-columns: 1fr 1fr;
|
||||
align-items: center;
|
||||
min-height: 2.5rem;
|
||||
padding: 4px;
|
||||
border-radius: var(--anlian-radius-pill);
|
||||
background: rgba(255, 255, 255, 0.32);
|
||||
border: 1px solid rgba(253, 189, 219, 0.45);
|
||||
cursor: pointer;
|
||||
user-select: none;
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
.anlian-pill-thumb {
|
||||
position: absolute;
|
||||
top: 4px;
|
||||
left: 4px;
|
||||
width: calc(50% - 4px);
|
||||
height: calc(100% - 8px);
|
||||
border-radius: var(--anlian-radius-pill);
|
||||
background: linear-gradient(135deg, rgba(253, 189, 219, 0.65), rgba(240, 168, 196, 0.75));
|
||||
box-shadow: 0 2px 10px rgba(253, 189, 219, 0.25);
|
||||
transition: transform 0.28s cubic-bezier(0.34, 1.2, 0.64, 1);
|
||||
pointer-events: none;
|
||||
}
|
||||
|
||||
.anlian-pill-input:checked + .anlian-pill-label .anlian-pill-thumb {
|
||||
transform: translateX(100%);
|
||||
}
|
||||
|
||||
.anlian-pill-option {
|
||||
position: relative;
|
||||
z-index: 1;
|
||||
text-align: center;
|
||||
font-size: 0.8125rem;
|
||||
font-weight: 600;
|
||||
color: var(--anlian-text-muted);
|
||||
padding: 0.35rem 0.5rem;
|
||||
transition: color var(--anlian-transition);
|
||||
}
|
||||
|
||||
.anlian-pill-input:not(:checked) + .anlian-pill-label .anlian-pill-option:first-child,
|
||||
.anlian-pill-input:checked + .anlian-pill-label .anlian-pill-option:last-child {
|
||||
color: var(--anlian-accent-text);
|
||||
}
|
||||
|
||||
.anlian-field-hint {
|
||||
margin: 0.4rem 0 0;
|
||||
font-size: 0.75rem;
|
||||
color: var(--anlian-text-muted);
|
||||
line-height: 1.4;
|
||||
}
|
||||
|
||||
/* ---------- 验证码行 ---------- */
|
||||
.anlian-code-row {
|
||||
display: flex;
|
||||
gap: 0.5rem;
|
||||
align-items: stretch;
|
||||
}
|
||||
|
||||
.anlian-code-row input {
|
||||
flex: 1;
|
||||
min-width: 0;
|
||||
}
|
||||
|
||||
.anlian-btn-send-code {
|
||||
flex-shrink: 0;
|
||||
align-self: stretch;
|
||||
padding: 0 1rem;
|
||||
border: 1px solid rgba(253, 189, 219, 0.5);
|
||||
border-radius: 12px;
|
||||
background: rgba(253, 189, 219, 0.32);
|
||||
color: var(--anlian-accent-text);
|
||||
font-size: 0.8125rem;
|
||||
font-weight: 600;
|
||||
cursor: pointer;
|
||||
white-space: nowrap;
|
||||
transition: background var(--anlian-transition), transform var(--anlian-transition);
|
||||
}
|
||||
|
||||
.anlian-btn-send-code:hover:not(:disabled) {
|
||||
background: rgba(253, 189, 219, 0.48);
|
||||
}
|
||||
|
||||
.anlian-btn-send-code:disabled {
|
||||
opacity: 0.55;
|
||||
cursor: not-allowed;
|
||||
}
|
||||
|
||||
/* ---------- 主按钮 ---------- */
|
||||
.anlian-btn-primary,
|
||||
.anlian-form-card .anlian-btn-submit,
|
||||
.anlian-form-card #login-btn,
|
||||
.anlian-form-card #submit-btn,
|
||||
.anlian-form-card #submit-comment-btn {
|
||||
display: block;
|
||||
width: 100%;
|
||||
margin-top: 1.25rem;
|
||||
padding: 0.75rem 1.25rem;
|
||||
font-size: 1rem;
|
||||
font-weight: 600;
|
||||
color: var(--anlian-accent-text);
|
||||
background: linear-gradient(135deg, rgba(253, 189, 219, 0.55), rgba(240, 168, 196, 0.65));
|
||||
border: 1px solid rgba(240, 168, 196, 0.75);
|
||||
border-radius: var(--anlian-radius-pill);
|
||||
cursor: pointer;
|
||||
transition: transform var(--anlian-transition), box-shadow var(--anlian-transition),
|
||||
background var(--anlian-transition);
|
||||
box-shadow: 0 4px 16px rgba(253, 189, 219, 0.22);
|
||||
}
|
||||
|
||||
.anlian-btn-primary:hover,
|
||||
.anlian-form-card .anlian-btn-submit:hover,
|
||||
.anlian-form-card #login-btn:hover,
|
||||
.anlian-form-card #submit-btn:hover,
|
||||
.anlian-form-card #submit-comment-btn:hover {
|
||||
background: linear-gradient(135deg, rgba(253, 189, 219, 0.68), rgba(240, 168, 196, 0.78));
|
||||
box-shadow: 0 6px 22px rgba(253, 189, 219, 0.32);
|
||||
transform: translateY(-1px);
|
||||
}
|
||||
|
||||
/* ---------- 提示与链接 ---------- */
|
||||
.anlian-alert {
|
||||
padding: 0.85rem 1rem;
|
||||
margin-bottom: 1rem;
|
||||
border-radius: 12px;
|
||||
font-size: 0.875rem;
|
||||
line-height: 1.45;
|
||||
}
|
||||
|
||||
.anlian-alert-danger {
|
||||
background: rgba(220, 80, 100, 0.12);
|
||||
border: 1px solid rgba(220, 80, 100, 0.28);
|
||||
color: #9e3a4a;
|
||||
}
|
||||
|
||||
.anlian-alert p {
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
.anlian-field-error {
|
||||
display: block;
|
||||
margin-top: 0.35rem;
|
||||
font-size: 0.8125rem;
|
||||
color: #b33a4d;
|
||||
}
|
||||
|
||||
.anlian-form-links {
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
gap: 1rem;
|
||||
margin-top: 1.25rem;
|
||||
flex-wrap: wrap;
|
||||
}
|
||||
|
||||
.anlian-form-links a {
|
||||
font-size: 0.875rem;
|
||||
font-weight: 500;
|
||||
color: var(--anlian-accent-text);
|
||||
text-decoration: none;
|
||||
}
|
||||
|
||||
.anlian-form-links a:hover {
|
||||
text-decoration: underline;
|
||||
}
|
||||
|
||||
/* ---------- 富文本编辑器 ---------- */
|
||||
.anlian-editor-wrap {
|
||||
border-radius: 12px;
|
||||
overflow: hidden;
|
||||
border: 1px solid rgba(253, 189, 219, 0.35);
|
||||
background: rgba(255, 255, 255, 0.45);
|
||||
}
|
||||
|
||||
.anlian-editor-wrap #editor {
|
||||
min-height: 360px;
|
||||
}
|
||||
|
||||
.anlian-editor-wrap .w-e-toolbar {
|
||||
background: rgba(255, 255, 255, 0.65) !important;
|
||||
border-bottom: 1px solid rgba(253, 189, 219, 0.3) !important;
|
||||
}
|
||||
|
||||
.anlian-editor-wrap .w-e-text-container {
|
||||
background: rgba(255, 255, 255, 0.35) !important;
|
||||
}
|
||||
|
||||
/* ---------- 评论表单区块 ---------- */
|
||||
.anlian-comment-form.anlian-form-card {
|
||||
margin-bottom: 2rem;
|
||||
}
|
||||
|
||||
@media (max-width: 576px) {
|
||||
.anlian-form-card {
|
||||
padding: 1.35rem 1.15rem;
|
||||
border-radius: 18px;
|
||||
}
|
||||
|
||||
.anlian-page-title {
|
||||
font-size: 1.5rem;
|
||||
}
|
||||
|
||||
.anlian-code-row {
|
||||
flex-direction: column;
|
||||
}
|
||||
|
||||
.anlian-btn-send-code {
|
||||
width: 100%;
|
||||
padding: 0.65rem;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,199 @@
|
||||
/* API 自动化指南页 */
|
||||
.api-guide-page {
|
||||
max-width: 52rem;
|
||||
align-items: stretch;
|
||||
text-align: left;
|
||||
padding-bottom: 3rem;
|
||||
}
|
||||
|
||||
.api-guide-hero {
|
||||
margin-bottom: 1.25rem;
|
||||
}
|
||||
|
||||
.api-guide-hero .api-guide-title {
|
||||
margin-top: 0;
|
||||
text-align: left;
|
||||
}
|
||||
|
||||
.api-guide-hero .anlian-page-lead {
|
||||
margin-bottom: 0;
|
||||
text-align: left;
|
||||
max-width: none;
|
||||
}
|
||||
|
||||
.api-guide-toc {
|
||||
margin-bottom: 1.25rem;
|
||||
}
|
||||
|
||||
.api-guide-toc-title {
|
||||
margin: 0 0 0.65rem;
|
||||
font-size: 0.875rem;
|
||||
font-weight: 700;
|
||||
color: var(--anlian-text-muted);
|
||||
text-transform: uppercase;
|
||||
letter-spacing: 0.04em;
|
||||
}
|
||||
|
||||
.api-guide-toc ol {
|
||||
margin: 0;
|
||||
padding-left: 1.25rem;
|
||||
line-height: 1.85;
|
||||
}
|
||||
|
||||
.api-guide-toc a {
|
||||
color: var(--anlian-accent-text);
|
||||
text-decoration: none;
|
||||
font-weight: 500;
|
||||
}
|
||||
|
||||
.api-guide-toc a:hover {
|
||||
text-decoration: underline;
|
||||
}
|
||||
|
||||
.api-guide-section {
|
||||
margin-bottom: 1.25rem;
|
||||
}
|
||||
|
||||
.api-guide-section h2 {
|
||||
margin: 0 0 0.85rem;
|
||||
font-size: 1.25rem;
|
||||
font-weight: 700;
|
||||
color: var(--anlian-text);
|
||||
border-bottom: 1px solid rgba(253, 189, 219, 0.45);
|
||||
padding-bottom: 0.4rem;
|
||||
}
|
||||
|
||||
.api-guide-section h3 {
|
||||
margin: 1.1rem 0 0.5rem;
|
||||
font-size: 1rem;
|
||||
font-weight: 600;
|
||||
color: var(--anlian-text);
|
||||
}
|
||||
|
||||
.api-guide-section p,
|
||||
.api-guide-section li {
|
||||
font-size: 0.9375rem;
|
||||
line-height: 1.65;
|
||||
color: var(--anlian-text);
|
||||
}
|
||||
|
||||
.api-guide-steps {
|
||||
margin: 0 0 1rem;
|
||||
padding-left: 1.35rem;
|
||||
}
|
||||
|
||||
.api-guide-steps li {
|
||||
margin-bottom: 0.35rem;
|
||||
}
|
||||
|
||||
.api-guide-list {
|
||||
margin: 0;
|
||||
padding-left: 1.25rem;
|
||||
}
|
||||
|
||||
.api-guide-list li {
|
||||
margin-bottom: 0.4rem;
|
||||
}
|
||||
|
||||
.api-guide-note {
|
||||
margin: 0.75rem 0 0;
|
||||
padding: 0.65rem 0.85rem;
|
||||
font-size: 0.8125rem;
|
||||
color: var(--anlian-text-muted);
|
||||
background: rgba(255, 255, 255, 0.35);
|
||||
border-radius: 10px;
|
||||
border-left: 3px solid var(--anlian-accent);
|
||||
}
|
||||
|
||||
.api-guide-warn {
|
||||
margin: 0.75rem 0 0;
|
||||
font-size: 0.875rem;
|
||||
color: #a85858;
|
||||
font-weight: 500;
|
||||
}
|
||||
|
||||
.api-guide-code {
|
||||
margin: 0.5rem 0 1rem;
|
||||
padding: 0.85rem 1rem;
|
||||
overflow-x: auto;
|
||||
font-size: 0.8125rem;
|
||||
line-height: 1.55;
|
||||
background: rgba(30, 30, 40, 0.06);
|
||||
border: 1px solid rgba(0, 0, 0, 0.06);
|
||||
border-radius: 10px;
|
||||
}
|
||||
|
||||
.api-guide-code code {
|
||||
font-family: ui-monospace, SFMono-Regular, Menlo, Consolas, monospace;
|
||||
color: #333;
|
||||
white-space: pre;
|
||||
}
|
||||
|
||||
.api-guide-table {
|
||||
width: 100%;
|
||||
margin: 0.75rem 0 1rem;
|
||||
border-collapse: collapse;
|
||||
font-size: 0.8125rem;
|
||||
}
|
||||
|
||||
.api-guide-table th,
|
||||
.api-guide-table td {
|
||||
padding: 0.5rem 0.65rem;
|
||||
border: 1px solid rgba(0, 0, 0, 0.08);
|
||||
text-align: left;
|
||||
vertical-align: top;
|
||||
}
|
||||
|
||||
.api-guide-table th {
|
||||
background: rgba(253, 189, 219, 0.2);
|
||||
font-weight: 600;
|
||||
}
|
||||
|
||||
.api-guide-table code {
|
||||
font-size: 0.75rem;
|
||||
word-break: break-all;
|
||||
}
|
||||
|
||||
.api-guide-section a:not(.api-guide-btn) {
|
||||
color: var(--anlian-accent-text);
|
||||
font-weight: 500;
|
||||
}
|
||||
|
||||
.api-guide-btn {
|
||||
display: inline-block;
|
||||
margin-top: 0.75rem;
|
||||
padding: 0.45rem 1rem;
|
||||
font-size: 0.875rem;
|
||||
font-weight: 600;
|
||||
color: #fff !important;
|
||||
text-decoration: none !important;
|
||||
background: var(--anlian-accent-text);
|
||||
border-radius: var(--anlian-radius-pill);
|
||||
}
|
||||
|
||||
.api-guide-btn:hover {
|
||||
opacity: 0.9;
|
||||
}
|
||||
|
||||
.api-guide-back {
|
||||
margin: 0.5rem 0 0;
|
||||
text-align: center;
|
||||
font-size: 0.875rem;
|
||||
}
|
||||
|
||||
.api-guide-back a {
|
||||
color: var(--anlian-text-muted);
|
||||
text-decoration: none;
|
||||
}
|
||||
|
||||
.api-guide-back a:hover {
|
||||
color: var(--anlian-accent-text);
|
||||
text-decoration: underline;
|
||||
}
|
||||
|
||||
@media (max-width: 575.98px) {
|
||||
.api-guide-table {
|
||||
display: block;
|
||||
overflow-x: auto;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,393 @@
|
||||
/*
|
||||
* @File: base.css
|
||||
* @Description: 网站全局基础样式文件,本次更新重点优化了导航栏的布局和美观度。
|
||||
* @Author: Your Name
|
||||
* @Date: 2023-10-27
|
||||
* @Update: 2023-10-28 - 优化导航栏颜色方案,并为Logo添加动画效果;新增左右留白容器的响应式样式;修复导航栏与主内容容器重叠问题。
|
||||
*/
|
||||
|
||||
/* --- 1. 全局盒模型与颜色变量设置 --- */
|
||||
* {
|
||||
box-sizing: border-box;
|
||||
padding: 0;
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
:root {
|
||||
--custom-primary: #ffffff; /* 主色调:柔和的蓝色 */
|
||||
--custom-primary-rgb: 93, 127, 229; /* 主色调的RGB值,用于透明度 */
|
||||
--custom-bg: rgba(255, 255, 255, 0.2); /* 导航栏背景色:半透明白色 */
|
||||
--custom-text: #333333; /* 主要文字颜色:深灰色,保证可读性 */
|
||||
--custom-link-hover: #fdbbdb; /* 链接悬停颜色:柔和的紫色 */
|
||||
--custom-btn-hover-bg: #fdbbdb; /* 按钮悬停背景色:柔和的蓝色 */
|
||||
/* 新增:宽屏时左右留白的宽度(可根据需求调整) */
|
||||
--side-gap-width: 120px;
|
||||
}
|
||||
|
||||
/* --- 2. 页面主体样式 --- */
|
||||
body {
|
||||
/* ========== 背景图:960w 优化版,避免全尺寸 1232px 浪费带宽 ========== */
|
||||
background-image: url("/static/img/bg-body-960.webp");
|
||||
background-repeat: no-repeat;
|
||||
background-size: cover;
|
||||
background-position: center center;
|
||||
background-attachment: fixed;
|
||||
background-color: #f8f9fa;
|
||||
|
||||
/* ========== 核心修改:重构布局流 ========== */
|
||||
/* 从row改为column,让导航栏+内容区垂直排列 */
|
||||
display: flex;
|
||||
flex-direction: column; /* 关键修改1:垂直布局 */
|
||||
overflow-x: hidden;
|
||||
overflow-y: auto;
|
||||
min-height: 100vh;
|
||||
margin: 0;
|
||||
position: relative;
|
||||
z-index: 1;
|
||||
width: 100vw;
|
||||
}
|
||||
|
||||
/* ========== 毛玻璃效果遮罩层(保留) ========== */
|
||||
/* body::before {
|
||||
content: "";
|
||||
position: absolute;
|
||||
top: 0;
|
||||
left: 0;
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
/* backdrop-filter: blur(1px); */
|
||||
/*background-color: rgba(255, 255, 255, 0.2);
|
||||
z-index: -1;
|
||||
background-attachment: fixed;
|
||||
} */
|
||||
|
||||
/* --- 3. 导航栏 (Navbar) 核心美化 --- */
|
||||
.navbar {
|
||||
background-color: var(--custom-bg) !important;
|
||||
backdrop-filter: blur(24px);
|
||||
border: 1px solid rgba(255, 255, 255, 0.2);
|
||||
box-shadow: inset 0 0 5px rgba(255, 255, 255, 0.1);
|
||||
padding-top: 0.75rem;
|
||||
padding-bottom: 0.75rem;
|
||||
position: relative;
|
||||
z-index: 1000;
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
.navbar-shell {
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
align-items: center;
|
||||
width: 100%;
|
||||
padding-left: 0.5rem;
|
||||
padding-right: 0.75rem;
|
||||
}
|
||||
|
||||
.navbar-start {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
flex-shrink: 0;
|
||||
}
|
||||
|
||||
.navbar .navbar-collapse {
|
||||
flex-grow: 1;
|
||||
}
|
||||
|
||||
@media (min-width: 992px) {
|
||||
.navbar .navbar-collapse {
|
||||
display: flex !important;
|
||||
flex-wrap: nowrap;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
gap: 1rem;
|
||||
}
|
||||
}
|
||||
|
||||
.navbar-nav-main {
|
||||
flex-wrap: wrap;
|
||||
}
|
||||
|
||||
.navbar-end {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
align-items: stretch;
|
||||
gap: 0.75rem;
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
@media (min-width: 992px) {
|
||||
.navbar-end {
|
||||
flex-direction: row;
|
||||
align-items: center;
|
||||
flex-shrink: 0;
|
||||
width: auto;
|
||||
margin-left: auto;
|
||||
gap: 0.75rem;
|
||||
}
|
||||
}
|
||||
|
||||
.navbar-search {
|
||||
gap: 0.5rem;
|
||||
align-items: center;
|
||||
}
|
||||
|
||||
.navbar-search .form-control {
|
||||
min-width: 120px;
|
||||
max-width: 180px;
|
||||
}
|
||||
|
||||
.navbar-auth {
|
||||
flex-direction: row;
|
||||
align-items: center;
|
||||
gap: 0.25rem;
|
||||
flex-wrap: nowrap;
|
||||
}
|
||||
|
||||
.navbar-auth .nav-link-auth,
|
||||
.navbar-auth .nav-link-btn {
|
||||
padding: 0.35rem 0.85rem !important;
|
||||
border-radius: 999px;
|
||||
border: 1px solid rgba(var(--custom-primary-rgb), 0.45);
|
||||
background: rgba(var(--custom-primary-rgb), 0.12);
|
||||
font-weight: 600;
|
||||
}
|
||||
|
||||
.navbar-auth .nav-link-auth:hover,
|
||||
.navbar-auth .nav-link-btn:hover {
|
||||
background: rgba(var(--custom-primary-rgb), 0.22);
|
||||
transform: none;
|
||||
}
|
||||
|
||||
.navbar-brand {
|
||||
color: var(--custom-primary) !important;
|
||||
font-weight: 700;
|
||||
margin-right: 2rem;
|
||||
}
|
||||
|
||||
@keyframes pulse {
|
||||
0% { transform: scale(1); }
|
||||
50% { transform: scale(1.05); }
|
||||
100% { transform: scale(1); }
|
||||
}
|
||||
|
||||
.navbar-logo {
|
||||
padding-top: 0.3125rem;
|
||||
padding-bottom: 0.3125rem;
|
||||
padding-left: 0.75rem;
|
||||
padding-right: 0.25rem;
|
||||
animation: pulse 3s ease-in-out infinite;
|
||||
}
|
||||
|
||||
.navbar-dark .nav-link {
|
||||
color: var(--custom-text) !important;
|
||||
margin-left: 0.5rem;
|
||||
margin-right: 0.5rem;
|
||||
transition: color 0.2s ease-in-out, transform 0.2s ease-in-out;
|
||||
}
|
||||
|
||||
.navbar-dark .nav-link:hover {
|
||||
color: var(--custom-link-hover) !important;
|
||||
transform: translateY(-2px);
|
||||
}
|
||||
|
||||
.navbar-search .form-control {
|
||||
padding-top: 0.5rem;
|
||||
padding-bottom: 0.5rem;
|
||||
border-radius: 0.375rem;
|
||||
outline: none;
|
||||
transition: box-shadow 0.2s ease-in-out, border-color 0.2s ease-in-out;
|
||||
}
|
||||
|
||||
.navbar-search .form-control:focus {
|
||||
border-color: rgba(var(--custom-primary-rgb), 0.5);
|
||||
box-shadow: 0 0 0 0.2rem rgba(var(--custom-primary-rgb), 0.25);
|
||||
}
|
||||
|
||||
.navbar-search .btn-outline-success {
|
||||
color: var(--custom-primary);
|
||||
border-color: var(--custom-primary);
|
||||
padding-top: 0.5rem;
|
||||
padding-bottom: 0.5rem;
|
||||
white-space: nowrap;
|
||||
transition: all 0.2s ease-in-out;
|
||||
}
|
||||
|
||||
.navbar-search .btn-outline-success:hover {
|
||||
background-color: var(--custom-btn-hover-bg);
|
||||
border-color: var(--custom-btn-hover-bg);
|
||||
color: #fff;
|
||||
}
|
||||
|
||||
@media (max-width: 991.98px) {
|
||||
.navbar-search {
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
.navbar-search .form-control {
|
||||
flex: 1;
|
||||
max-width: none;
|
||||
}
|
||||
|
||||
.navbar-auth {
|
||||
justify-content: flex-start;
|
||||
padding-top: 0.25rem;
|
||||
}
|
||||
}
|
||||
|
||||
/* --- 6. 主要内容区域样式 --- */
|
||||
/* .main-container {
|
||||
/* 调整:主内容容器在横向flex中占剩余空间 */
|
||||
/*flex: 1;
|
||||
/* 关键修改3:移除多余的padding-top,因为导航栏已回归文档流,无需遮挡补偿 */
|
||||
/*padding-bottom: 4rem;
|
||||
/* 限制主内容最大宽度,保证阅读体验 */
|
||||
/*max-width: 1200px;*/
|
||||
/* 让主内容在content-wrapper中居中(配合左右留白) */
|
||||
/*margin: 0 auto;
|
||||
/* 左右内边距,适配窄屏 */
|
||||
/* padding-left: 1rem;
|
||||
padding-right: 1rem;
|
||||
/* 毛玻璃效果(保留) */
|
||||
/* background-color: rgba(255, 255, 255, 0.1);
|
||||
backdrop-filter: blur(0px);
|
||||
border: 1px solid rgba(255, 255, 255, 0.2);
|
||||
box-shadow: inset 0 0 5px rgba(255, 255, 255, 0.1);
|
||||
border-radius: 4px;
|
||||
padding: 50px 100px; */
|
||||
/* 新增:给主内容容器添加顶部外边距,增加与导航栏的间距 */
|
||||
/*margin-top: 2rem; */
|
||||
/*} */
|
||||
|
||||
/* --- 7. 左右留白容器样式 (核心需求,适配新布局) ---
|
||||
.left-container, .right-container {
|
||||
/* 窄屏时宽度为0,不显示留白 */
|
||||
/*width: 0;
|
||||
/* 不占用空间 */
|
||||
/*flex-shrink: 0;
|
||||
/* 背景色和页面主体一致,视觉上是留白 */
|
||||
/*background-color: transparent;
|
||||
} */
|
||||
|
||||
/* 宽屏断点(和Bootstrap lg断点一致:992px) */
|
||||
/* @media (min-width: 992px) {
|
||||
/* 宽屏时显示左右留白 */
|
||||
/* .left-container, .right-container {
|
||||
/* 使用自定义变量设置留白宽度,可灵活调整 */
|
||||
/*width: var(--side-gap-width);
|
||||
background-color: transparent;
|
||||
/* 可选:添加轻微阴影,增强层次感 */
|
||||
/*box-shadow: inset 0 0 8px rgba(0, 0, 0, 0.02);*/
|
||||
/*} */
|
||||
|
||||
/* 可选:超宽屏(比如1600px以上)时,限制留白最大宽度 */
|
||||
/*@media (min-width: 1600px) {
|
||||
.left-container, .right-container {
|
||||
width: calc((100vw - 1200px) / 2);
|
||||
max-width: 200px;
|
||||
background-color: transparent;
|
||||
}
|
||||
}
|
||||
} */
|
||||
|
||||
/* 2. 主体容器样式:确保和footer分隔 */
|
||||
.main-container {
|
||||
/* 主体容器宽度自适应,可根据需求调整最大宽度 */
|
||||
width: 100%;
|
||||
/* 居中显示(可选) */
|
||||
margin: 0 auto;
|
||||
/* 关键:给主体底部加间距,和footer分开 */
|
||||
margin-bottom: 1rem;
|
||||
/* 主体内边距,防止内容贴边 */
|
||||
padding: 1rem;
|
||||
}
|
||||
|
||||
/* --- 页脚 (Footer) 样式 - 毛玻璃效果 + 适配新增内容 --- */
|
||||
.footer {
|
||||
/* 核心毛玻璃效果 */
|
||||
background-color: rgba(255, 255, 255, 0.3);
|
||||
backdrop-filter: blur(12px);
|
||||
-webkit-backdrop-filter: blur(12px); /* 兼容webkit内核浏览器 */
|
||||
border: 1px solid rgba(255, 255, 255, 0.1); /* 浅白色边框增强质感 */
|
||||
box-shadow: inset 0 0 10px rgba(255, 255, 255, 0.05); /* 内阴影提升层次 */
|
||||
|
||||
/* 布局样式 - 回归文档流,不脱离 */
|
||||
position: static;
|
||||
width: 100%;
|
||||
padding: 1.5rem 1rem; /* 上下内边距充足,容纳多行内容 */
|
||||
margin-top: 2rem; /* 与上方内容分隔 */
|
||||
height: auto; /* 高度自适应内容,不挤压 */
|
||||
|
||||
/* 内容排版 - 垂直分布,居中对齐 */
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
align-items: center;
|
||||
gap: 0.75rem; /* 各子元素之间的间距 */
|
||||
|
||||
/* 文字基础样式 */
|
||||
color: #ffffff !important;
|
||||
font-size: 14px;
|
||||
}
|
||||
|
||||
/* footer logo样式 */
|
||||
.footer-logo {
|
||||
margin-bottom: 0.25rem; /* 与版权信息轻微分隔 */
|
||||
}
|
||||
|
||||
.footer-logo img {
|
||||
border-radius: 50%; /* logo圆形化(可选) */
|
||||
transition: transform 0.2s ease-in-out;
|
||||
}
|
||||
|
||||
.footer-logo img:hover {
|
||||
transform: scale(1.1); /* logo悬浮轻微放大 */
|
||||
}
|
||||
|
||||
/* 版权信息容器 */
|
||||
.footer-container {
|
||||
text-align: center;
|
||||
color: rgba(255, 255, 255, 0.9); /* 文字半透,更柔和 */
|
||||
}
|
||||
|
||||
/* 联系我们链接 */
|
||||
.footer-contact a {
|
||||
color: rgba(255, 255, 255, 0.9) !important;
|
||||
text-decoration: none;
|
||||
padding: 0.25rem 0.75rem;
|
||||
border-radius: 4px;
|
||||
transition: all 0.2s ease-in-out;
|
||||
}
|
||||
|
||||
.footer-contact a:hover {
|
||||
color: #ffffff !important;
|
||||
background-color: rgba(255, 255, 255, 0.15);
|
||||
text-decoration: underline;
|
||||
}
|
||||
|
||||
/* 作者信息样式 */
|
||||
.footer-author {
|
||||
color: rgba(255, 255, 255, 0.7); /* 作者信息稍淡,突出层级 */
|
||||
font-size: 13px;
|
||||
}
|
||||
|
||||
.footer-author a {
|
||||
color: rgba(255, 255, 255, 0.85) !important;
|
||||
text-decoration: none;
|
||||
transition: color 0.2s ease-in-out;
|
||||
}
|
||||
|
||||
.footer-author a:hover {
|
||||
color: #ffffff !important;
|
||||
text-decoration: underline;
|
||||
}
|
||||
|
||||
/* 响应式适配 - 小屏幕优化 */
|
||||
@media (max-width: 575.98px) {
|
||||
.footer {
|
||||
padding: 1rem 0.5rem;
|
||||
gap: 0.5rem;
|
||||
}
|
||||
|
||||
.footer-author {
|
||||
font-size: 12px;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,670 @@
|
||||
/**
|
||||
* 聊天模块 — 与论坛 feed 粉色毛玻璃主题统一
|
||||
*/
|
||||
|
||||
.chat-page {
|
||||
--chat-accent: #fdbbdb;
|
||||
--chat-accent-text: #a85878;
|
||||
--chat-accent-muted: #c97a96;
|
||||
--chat-text: #333;
|
||||
--chat-text-muted: #666;
|
||||
--chat-glass: rgba(255, 255, 255, 0.32);
|
||||
--chat-glass-border: rgba(255, 255, 255, 0.45);
|
||||
--chat-shadow: 0 4px 16px rgba(253, 189, 219, 0.08);
|
||||
}
|
||||
|
||||
.chat-page .section-wrap.chat-stage {
|
||||
padding: 2rem 2.5rem 2.5rem;
|
||||
}
|
||||
|
||||
.chat-page .section-wrap.chat-stage-narrow {
|
||||
max-width: 640px;
|
||||
margin-left: auto;
|
||||
margin-right: auto;
|
||||
}
|
||||
|
||||
.feed-list-title.chat-room-title {
|
||||
margin-bottom: 0;
|
||||
text-align: left;
|
||||
border-bottom: none;
|
||||
padding-bottom: 0;
|
||||
flex: 1;
|
||||
min-width: 0;
|
||||
}
|
||||
|
||||
.chat-page-lead {
|
||||
margin: 0.75rem 0 1rem;
|
||||
font-size: 0.9375rem;
|
||||
line-height: 1.65;
|
||||
color: var(--chat-text-muted);
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
.chat-room-desc {
|
||||
text-align: left;
|
||||
margin-bottom: 0.75rem;
|
||||
}
|
||||
|
||||
.chat-breadcrumb {
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
align-items: center;
|
||||
gap: 0.35rem;
|
||||
margin-bottom: 1rem;
|
||||
font-size: 0.8125rem;
|
||||
color: var(--chat-text-muted);
|
||||
}
|
||||
|
||||
.chat-breadcrumb a {
|
||||
color: var(--chat-accent-muted);
|
||||
text-decoration: none;
|
||||
}
|
||||
|
||||
.chat-breadcrumb a:hover {
|
||||
color: var(--chat-accent-text);
|
||||
}
|
||||
|
||||
.chat-breadcrumb-sep {
|
||||
opacity: 0.45;
|
||||
}
|
||||
|
||||
.chat-breadcrumb-current {
|
||||
color: var(--chat-text);
|
||||
font-weight: 500;
|
||||
}
|
||||
|
||||
.chat-room-header {
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
gap: 0.75rem;
|
||||
margin-bottom: 0.5rem;
|
||||
padding-bottom: 0.75rem;
|
||||
border-bottom: 1px solid rgba(255, 255, 255, 0.45);
|
||||
}
|
||||
|
||||
.chat-room-meta {
|
||||
margin: 0 0 1.25rem;
|
||||
font-size: 0.8125rem;
|
||||
color: var(--chat-text-muted);
|
||||
}
|
||||
|
||||
.chat-room-meta a {
|
||||
color: var(--chat-accent-text);
|
||||
text-decoration: none;
|
||||
font-weight: 600;
|
||||
}
|
||||
|
||||
.chat-room-meta a:hover {
|
||||
text-decoration: underline;
|
||||
}
|
||||
|
||||
.chat-actions {
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
gap: 0.75rem;
|
||||
justify-content: center;
|
||||
margin-bottom: 1.25rem;
|
||||
}
|
||||
|
||||
.chat-room-search {
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
gap: 0.65rem;
|
||||
margin-bottom: 1.25rem;
|
||||
}
|
||||
|
||||
.chat-room-search-input {
|
||||
flex: 1;
|
||||
min-width: 0;
|
||||
min-height: 42px;
|
||||
padding: 0.55rem 0.9rem;
|
||||
border: 1px solid rgba(253, 189, 219, 0.45);
|
||||
border-radius: 999px;
|
||||
background: rgba(255, 255, 255, 0.72);
|
||||
color: var(--chat-text);
|
||||
font-size: 0.9375rem;
|
||||
}
|
||||
|
||||
.chat-room-search-input:focus {
|
||||
outline: none;
|
||||
border-color: rgba(253, 189, 219, 0.75);
|
||||
box-shadow: 0 0 0 3px rgba(253, 189, 219, 0.22);
|
||||
}
|
||||
|
||||
.chat-room-search-input::placeholder {
|
||||
color: #aaa;
|
||||
}
|
||||
|
||||
.chat-room-search-btn {
|
||||
flex-shrink: 0;
|
||||
padding: 0.55rem 1.1rem;
|
||||
border: 1px solid rgba(253, 189, 219, 0.55);
|
||||
border-radius: 999px;
|
||||
background: rgba(253, 189, 219, 0.35);
|
||||
color: var(--chat-accent-text);
|
||||
font-size: 0.875rem;
|
||||
font-weight: 600;
|
||||
cursor: pointer;
|
||||
transition: background 0.2s ease;
|
||||
}
|
||||
|
||||
.chat-room-search-btn:hover {
|
||||
background: rgba(253, 189, 219, 0.5);
|
||||
}
|
||||
|
||||
.chat-list-footer {
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
margin-top: 1.5rem;
|
||||
padding-top: 1.25rem;
|
||||
border-top: 1px solid rgba(255, 255, 255, 0.45);
|
||||
}
|
||||
|
||||
.chat-create-room-btn {
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
gap: 0.65rem;
|
||||
width: min(100%, 320px);
|
||||
padding: 0.85rem 1.35rem;
|
||||
border-radius: 999px;
|
||||
text-decoration: none;
|
||||
color: #fff;
|
||||
font-size: 0.9375rem;
|
||||
font-weight: 600;
|
||||
border: 1px solid rgba(255, 255, 255, 0.35);
|
||||
background: linear-gradient(135deg, #f0a8c4 0%, #a85878 100%);
|
||||
box-shadow:
|
||||
0 6px 20px rgba(168, 88, 120, 0.28),
|
||||
inset 0 1px 0 rgba(255, 255, 255, 0.25);
|
||||
transition: transform 0.15s ease, box-shadow 0.15s ease, filter 0.15s ease;
|
||||
}
|
||||
|
||||
.chat-create-room-btn:hover {
|
||||
color: #fff;
|
||||
text-decoration: none;
|
||||
transform: translateY(-1px);
|
||||
box-shadow:
|
||||
0 8px 24px rgba(168, 88, 120, 0.34),
|
||||
inset 0 1px 0 rgba(255, 255, 255, 0.3);
|
||||
filter: brightness(1.03);
|
||||
}
|
||||
|
||||
.chat-create-room-btn:active {
|
||||
transform: translateY(0);
|
||||
}
|
||||
|
||||
.chat-create-room-btn__icon {
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
width: 1.75rem;
|
||||
height: 1.75rem;
|
||||
border-radius: 50%;
|
||||
font-size: 0.8125rem;
|
||||
background: rgba(255, 255, 255, 0.22);
|
||||
}
|
||||
|
||||
.chat-search-empty {
|
||||
margin-top: 0.5rem;
|
||||
}
|
||||
|
||||
.chat-action-link {
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
}
|
||||
|
||||
.chat-ws-status {
|
||||
flex-shrink: 0;
|
||||
font-size: 0.75rem;
|
||||
font-weight: 500;
|
||||
padding: 0.2rem 0.65rem;
|
||||
border-radius: 999px;
|
||||
color: var(--chat-accent-muted);
|
||||
background: rgba(255, 255, 255, 0.35);
|
||||
border: 1px solid rgba(253, 189, 219, 0.35);
|
||||
}
|
||||
|
||||
.chat-ws-status-ok {
|
||||
color: #3d7a52;
|
||||
background: rgba(144, 238, 144, 0.2);
|
||||
border-color: rgba(144, 238, 144, 0.45);
|
||||
}
|
||||
|
||||
.chat-ws-status-error {
|
||||
color: #a85858;
|
||||
background: rgba(255, 182, 193, 0.25);
|
||||
border-color: rgba(255, 160, 160, 0.45);
|
||||
}
|
||||
|
||||
.chat-ws-errors {
|
||||
margin: 0.5rem 0 0;
|
||||
color: #a85858;
|
||||
font-size: 0.875rem;
|
||||
}
|
||||
|
||||
/* ---------- 消息区 ---------- */
|
||||
|
||||
.chat-messages {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 0.85rem;
|
||||
margin-bottom: 1.25rem;
|
||||
padding: 1rem;
|
||||
border-radius: 14px;
|
||||
background: var(--chat-glass);
|
||||
backdrop-filter: blur(12px);
|
||||
-webkit-backdrop-filter: blur(12px);
|
||||
border: 1px solid var(--chat-glass-border);
|
||||
box-shadow: var(--chat-shadow);
|
||||
min-height: 240px;
|
||||
max-height: min(60vh, 520px);
|
||||
overflow-y: auto;
|
||||
}
|
||||
|
||||
.chat-message {
|
||||
display: flex;
|
||||
gap: 0.75rem;
|
||||
align-items: flex-start;
|
||||
}
|
||||
|
||||
.chat-message-mine {
|
||||
flex-direction: row-reverse;
|
||||
}
|
||||
|
||||
.chat-message-mine .chat-message-body {
|
||||
text-align: right;
|
||||
}
|
||||
|
||||
.chat-avatar {
|
||||
width: 40px;
|
||||
height: 40px;
|
||||
border-radius: 50%;
|
||||
object-fit: cover;
|
||||
flex-shrink: 0;
|
||||
border: 2px solid rgba(255, 255, 255, 0.65);
|
||||
box-shadow: 0 2px 8px rgba(253, 189, 219, 0.15);
|
||||
}
|
||||
|
||||
.chat-message-body {
|
||||
flex: 1;
|
||||
min-width: 0;
|
||||
padding: 0.6rem 0.75rem;
|
||||
border: 1px solid rgba(253, 189, 219, 0.4);
|
||||
border-radius: 10px;
|
||||
background: rgba(255, 255, 255, 0.35);
|
||||
}
|
||||
|
||||
.chat-message-mine .chat-message-body {
|
||||
border-color: rgba(240, 168, 196, 0.55);
|
||||
background: rgba(253, 189, 219, 0.22);
|
||||
}
|
||||
|
||||
.chat-message-meta {
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
align-items: center;
|
||||
gap: 0.5rem;
|
||||
font-size: 0.75rem;
|
||||
color: var(--chat-text-muted);
|
||||
margin-bottom: 0.35rem;
|
||||
}
|
||||
|
||||
.chat-message-mine .chat-message-meta {
|
||||
justify-content: flex-end;
|
||||
}
|
||||
|
||||
.chat-author {
|
||||
color: var(--chat-text);
|
||||
font-weight: 600;
|
||||
}
|
||||
|
||||
.chat-profile-link {
|
||||
color: var(--chat-accent-text);
|
||||
text-decoration: none;
|
||||
font-weight: 500;
|
||||
}
|
||||
|
||||
.chat-profile-link:hover {
|
||||
text-decoration: underline;
|
||||
}
|
||||
|
||||
.chat-content {
|
||||
margin: 0;
|
||||
white-space: pre-wrap;
|
||||
word-break: break-word;
|
||||
font-size: 0.9375rem;
|
||||
line-height: 1.55;
|
||||
color: var(--chat-text);
|
||||
}
|
||||
|
||||
.chat-compose {
|
||||
margin-top: 0.5rem;
|
||||
}
|
||||
|
||||
/* ---------- 列表 / 分页 ---------- */
|
||||
|
||||
.chat-room-grid {
|
||||
display: grid;
|
||||
grid-template-columns: repeat(auto-fill, minmax(240px, 1fr));
|
||||
gap: 1rem;
|
||||
}
|
||||
|
||||
.chat-room-card {
|
||||
display: block;
|
||||
padding: 1.15rem;
|
||||
border-radius: 14px;
|
||||
background: var(--chat-glass);
|
||||
backdrop-filter: blur(10px);
|
||||
-webkit-backdrop-filter: blur(10px);
|
||||
border: 1px solid rgba(253, 189, 219, 0.35);
|
||||
color: inherit;
|
||||
text-decoration: none;
|
||||
transition: transform 0.15s ease, box-shadow 0.15s ease;
|
||||
}
|
||||
|
||||
.chat-room-card:hover {
|
||||
transform: translateY(-2px);
|
||||
box-shadow: 0 4px 14px rgba(253, 189, 219, 0.2);
|
||||
color: inherit;
|
||||
}
|
||||
|
||||
.chat-room-card h2 {
|
||||
margin: 0 0 0.5rem;
|
||||
font-size: 1.05rem;
|
||||
color: var(--chat-text);
|
||||
}
|
||||
|
||||
.chat-room-card p {
|
||||
margin: 0;
|
||||
color: var(--chat-text-muted);
|
||||
font-size: 0.875rem;
|
||||
}
|
||||
|
||||
.chat-pagination {
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
flex-wrap: wrap;
|
||||
gap: 0.75rem;
|
||||
margin-bottom: 1rem;
|
||||
font-size: 0.875rem;
|
||||
}
|
||||
|
||||
.chat-pagination-link {
|
||||
padding: 0.35rem 0.85rem;
|
||||
border-radius: 999px;
|
||||
text-decoration: none;
|
||||
color: var(--chat-accent-text);
|
||||
background: rgba(253, 189, 219, 0.25);
|
||||
border: 1px solid rgba(253, 189, 219, 0.4);
|
||||
}
|
||||
|
||||
.chat-pagination-link:hover {
|
||||
background: rgba(253, 189, 219, 0.4);
|
||||
color: var(--chat-accent-text);
|
||||
}
|
||||
|
||||
.chat-pagination-info {
|
||||
color: var(--chat-text-muted);
|
||||
}
|
||||
|
||||
/* ---------- 私聊收件箱 ---------- */
|
||||
|
||||
.feed-list-title.chat-inbox-title {
|
||||
margin-bottom: 0;
|
||||
text-align: left;
|
||||
border-bottom: none;
|
||||
padding-bottom: 0;
|
||||
}
|
||||
|
||||
.chat-inbox-header {
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
gap: 0.75rem;
|
||||
margin-bottom: 1.25rem;
|
||||
padding-bottom: 0.75rem;
|
||||
border-bottom: 1px solid rgba(255, 255, 255, 0.45);
|
||||
}
|
||||
|
||||
.chat-inbox-new-btn {
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
gap: 0.45rem;
|
||||
padding: 0.5rem 1rem;
|
||||
border-radius: 999px;
|
||||
font-size: 0.8125rem;
|
||||
font-weight: 600;
|
||||
text-decoration: none;
|
||||
color: var(--chat-accent-text);
|
||||
background: rgba(253, 189, 219, 0.28);
|
||||
border: 1px solid rgba(253, 189, 219, 0.45);
|
||||
transition: background 0.2s ease, box-shadow 0.2s ease;
|
||||
}
|
||||
|
||||
.chat-inbox-new-btn:hover {
|
||||
color: var(--chat-accent-text);
|
||||
background: rgba(253, 189, 219, 0.42);
|
||||
box-shadow: 0 4px 12px rgba(253, 189, 219, 0.2);
|
||||
}
|
||||
|
||||
.chat-inbox-panel {
|
||||
padding: 0.85rem;
|
||||
border-radius: 14px;
|
||||
background: var(--chat-glass);
|
||||
backdrop-filter: blur(12px);
|
||||
-webkit-backdrop-filter: blur(12px);
|
||||
border: 1px solid var(--chat-glass-border);
|
||||
box-shadow: var(--chat-shadow);
|
||||
}
|
||||
|
||||
.chat-inbox-panel--compact {
|
||||
padding: 0.65rem;
|
||||
}
|
||||
|
||||
.chat-inbox-list {
|
||||
list-style: none;
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
}
|
||||
|
||||
.chat-inbox-list li + li {
|
||||
margin-top: 0.5rem;
|
||||
}
|
||||
|
||||
.chat-inbox-item {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 0.75rem;
|
||||
padding: 0.75rem 0.85rem;
|
||||
border-radius: 12px;
|
||||
text-decoration: none;
|
||||
color: var(--chat-text);
|
||||
background: rgba(255, 255, 255, 0.28);
|
||||
border: 1px solid rgba(253, 189, 219, 0.22);
|
||||
transition: background 0.15s ease, border-color 0.15s ease;
|
||||
}
|
||||
|
||||
.chat-inbox-item:hover {
|
||||
background: rgba(253, 189, 219, 0.18);
|
||||
border-color: rgba(253, 189, 219, 0.38);
|
||||
color: var(--chat-text);
|
||||
}
|
||||
|
||||
.chat-inbox-avatar {
|
||||
flex-shrink: 0;
|
||||
width: 44px;
|
||||
height: 44px;
|
||||
border-radius: 50%;
|
||||
object-fit: cover;
|
||||
border: 2px solid rgba(255, 255, 255, 0.7);
|
||||
box-shadow: 0 2px 8px rgba(253, 189, 219, 0.15);
|
||||
}
|
||||
|
||||
.chat-inbox-body {
|
||||
flex: 1;
|
||||
min-width: 0;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 0.2rem;
|
||||
}
|
||||
|
||||
.chat-inbox-top {
|
||||
display: flex;
|
||||
align-items: baseline;
|
||||
justify-content: space-between;
|
||||
gap: 0.5rem;
|
||||
}
|
||||
|
||||
.chat-inbox-name {
|
||||
font-size: 0.9375rem;
|
||||
font-weight: 600;
|
||||
color: var(--chat-accent-text);
|
||||
}
|
||||
|
||||
.chat-inbox-time {
|
||||
flex-shrink: 0;
|
||||
font-size: 0.75rem;
|
||||
color: var(--chat-text-muted);
|
||||
}
|
||||
|
||||
.chat-inbox-preview {
|
||||
display: block;
|
||||
font-size: 0.8125rem;
|
||||
line-height: 1.45;
|
||||
color: var(--chat-text-muted);
|
||||
white-space: nowrap;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
}
|
||||
|
||||
.chat-inbox-arrow {
|
||||
flex-shrink: 0;
|
||||
font-size: 0.75rem;
|
||||
color: var(--chat-accent-muted);
|
||||
opacity: 0.75;
|
||||
}
|
||||
|
||||
.chat-inbox-empty {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
gap: 0.65rem;
|
||||
padding: 2.5rem 1.25rem;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
.chat-inbox-empty-icon {
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
width: 3.25rem;
|
||||
height: 3.25rem;
|
||||
border-radius: 50%;
|
||||
font-size: 1.25rem;
|
||||
color: var(--chat-accent-muted);
|
||||
background: rgba(253, 189, 219, 0.22);
|
||||
border: 1px solid rgba(253, 189, 219, 0.35);
|
||||
}
|
||||
|
||||
.chat-inbox-empty-title {
|
||||
margin: 0;
|
||||
font-size: 1rem;
|
||||
font-weight: 600;
|
||||
color: var(--chat-text);
|
||||
}
|
||||
|
||||
.chat-inbox-empty-lead {
|
||||
margin: 0;
|
||||
max-width: 18rem;
|
||||
font-size: 0.875rem;
|
||||
line-height: 1.55;
|
||||
color: var(--chat-text-muted);
|
||||
}
|
||||
|
||||
.chat-inbox-empty-btn {
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
gap: 0.45rem;
|
||||
margin-top: 0.35rem;
|
||||
padding: 0.65rem 1.25rem;
|
||||
border-radius: 999px;
|
||||
font-size: 0.875rem;
|
||||
font-weight: 600;
|
||||
text-decoration: none;
|
||||
color: #fff;
|
||||
background: linear-gradient(135deg, #f0a8c4 0%, #a85878 100%);
|
||||
border: 1px solid rgba(255, 255, 255, 0.3);
|
||||
box-shadow: 0 4px 14px rgba(168, 88, 120, 0.25);
|
||||
transition: transform 0.15s ease, box-shadow 0.15s ease;
|
||||
}
|
||||
|
||||
.chat-inbox-empty-btn:hover {
|
||||
color: #fff;
|
||||
transform: translateY(-1px);
|
||||
box-shadow: 0 6px 18px rgba(168, 88, 120, 0.32);
|
||||
}
|
||||
|
||||
.chat-thread-list {
|
||||
list-style: none;
|
||||
padding: 0;
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
.chat-thread-list li + li {
|
||||
margin-top: 0.5rem;
|
||||
}
|
||||
|
||||
.chat-thread-list a {
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
align-items: center;
|
||||
padding: 0.85rem 1rem;
|
||||
border-radius: 12px;
|
||||
background: var(--chat-glass);
|
||||
border: 1px solid rgba(253, 189, 219, 0.3);
|
||||
color: var(--chat-text);
|
||||
text-decoration: none;
|
||||
}
|
||||
|
||||
.chat-thread-list a:hover {
|
||||
background: rgba(253, 189, 219, 0.2);
|
||||
}
|
||||
|
||||
.chat-thread-time {
|
||||
font-size: 0.8125rem;
|
||||
color: var(--chat-text-muted);
|
||||
}
|
||||
|
||||
.chat-empty,
|
||||
.chat-login-hint {
|
||||
color: var(--chat-text-muted);
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
.chat-empty a,
|
||||
.chat-login-hint a {
|
||||
color: var(--chat-accent-text);
|
||||
font-weight: 600;
|
||||
}
|
||||
|
||||
@media (max-width: 768px) {
|
||||
.chat-page .section-wrap.chat-stage {
|
||||
padding: 1.5rem 1.25rem 2rem;
|
||||
}
|
||||
|
||||
.feed-list-title.chat-room-title {
|
||||
font-size: 1.25rem;
|
||||
}
|
||||
}
|
||||
|
||||
@media (max-width: 640px) {
|
||||
.chat-messages {
|
||||
max-height: none;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,212 @@
|
||||
/* 详情页:箭头上一篇/下一篇 + 推荐阅读轮播 */
|
||||
|
||||
.detail-reading-extras {
|
||||
margin-bottom: 2rem;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 1.25rem;
|
||||
}
|
||||
|
||||
.detail-adjacent-nav,
|
||||
.detail-recommend {
|
||||
padding: 1rem 1.25rem !important;
|
||||
margin: 0 !important;
|
||||
}
|
||||
|
||||
/* --- 上一篇 / 下一篇:左右箭头 --- */
|
||||
.detail-adjacent-bar {
|
||||
display: flex;
|
||||
align-items: stretch;
|
||||
justify-content: space-between;
|
||||
gap: 0.75rem;
|
||||
}
|
||||
|
||||
.detail-adjacent-side {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 0.5rem;
|
||||
min-width: 0;
|
||||
flex: 1;
|
||||
}
|
||||
|
||||
.detail-adjacent-side-prev {
|
||||
justify-content: flex-start;
|
||||
}
|
||||
|
||||
.detail-adjacent-side-next {
|
||||
justify-content: flex-end;
|
||||
text-align: right;
|
||||
}
|
||||
|
||||
.detail-arrow-btn {
|
||||
flex-shrink: 0;
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
width: 2.25rem;
|
||||
height: 2.25rem;
|
||||
border-radius: 50%;
|
||||
background: linear-gradient(145deg, #fdbbdb, #f0a8c4);
|
||||
color: #fff;
|
||||
text-decoration: none;
|
||||
box-shadow: 0 2px 8px rgba(168, 88, 120, 0.25);
|
||||
transition: transform 0.2s ease, box-shadow 0.2s ease;
|
||||
}
|
||||
|
||||
.detail-arrow-btn:hover {
|
||||
transform: scale(1.06);
|
||||
box-shadow: 0 4px 12px rgba(168, 88, 120, 0.35);
|
||||
color: #fff;
|
||||
}
|
||||
|
||||
.detail-arrow-btn.is-disabled {
|
||||
background: rgba(0, 0, 0, 0.08);
|
||||
color: #bbb;
|
||||
box-shadow: none;
|
||||
cursor: default;
|
||||
pointer-events: none;
|
||||
}
|
||||
|
||||
.detail-adjacent-title {
|
||||
color: #333;
|
||||
text-decoration: none;
|
||||
font-weight: 600;
|
||||
font-size: 0.9rem;
|
||||
line-height: 1.4;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
display: -webkit-box;
|
||||
-webkit-line-clamp: 2;
|
||||
-webkit-box-orient: vertical;
|
||||
}
|
||||
|
||||
.detail-adjacent-title:hover {
|
||||
color: #a85878;
|
||||
}
|
||||
|
||||
/* --- 推荐阅读轮播 --- */
|
||||
.detail-recommend-heading {
|
||||
margin: 0 0 0.85rem;
|
||||
font-size: 0.95rem;
|
||||
font-weight: 700;
|
||||
color: #a85878;
|
||||
letter-spacing: 0.02em;
|
||||
}
|
||||
|
||||
.detail-recommend-viewport {
|
||||
overflow: hidden;
|
||||
border-radius: 12px;
|
||||
}
|
||||
|
||||
.detail-recommend-track {
|
||||
display: flex;
|
||||
align-items: stretch;
|
||||
transition: transform 0.45s cubic-bezier(0.4, 0, 0.2, 1);
|
||||
will-change: transform;
|
||||
}
|
||||
|
||||
.detail-recommend-slide {
|
||||
flex: 0 0 100%;
|
||||
box-sizing: border-box;
|
||||
padding: 0 0.15rem;
|
||||
display: flex;
|
||||
align-items: stretch;
|
||||
}
|
||||
|
||||
.detail-recommend-card {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
flex: 1;
|
||||
width: 100%;
|
||||
gap: 0.35rem;
|
||||
padding: 1rem 1.1rem;
|
||||
border-radius: 12px;
|
||||
background: rgba(255, 255, 255, 0.55);
|
||||
border: 1px solid rgba(255, 255, 255, 0.65);
|
||||
text-decoration: none;
|
||||
transition: background 0.2s ease, border-color 0.2s ease;
|
||||
}
|
||||
|
||||
.detail-recommend-card:hover {
|
||||
background: rgba(255, 255, 255, 0.82);
|
||||
border-color: rgba(253, 187, 219, 0.8);
|
||||
}
|
||||
|
||||
.detail-recommend-card-title {
|
||||
flex: 1 1 auto;
|
||||
color: #222;
|
||||
font-weight: 600;
|
||||
font-size: 0.95rem;
|
||||
line-height: 1.45;
|
||||
/* 固定两行高度,短标题与长标题卡片等高 */
|
||||
min-height: calc(0.95rem * 1.45 * 2);
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
display: -webkit-box;
|
||||
-webkit-line-clamp: 2;
|
||||
-webkit-box-orient: vertical;
|
||||
}
|
||||
|
||||
.detail-recommend-card-meta {
|
||||
flex-shrink: 0;
|
||||
margin-top: auto;
|
||||
font-size: 0.78rem;
|
||||
color: #888;
|
||||
}
|
||||
|
||||
.detail-recommend-dots {
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
gap: 0.45rem;
|
||||
margin-top: 0.85rem;
|
||||
padding-bottom: 0.15rem;
|
||||
}
|
||||
|
||||
.detail-recommend-dot {
|
||||
width: 0.45rem;
|
||||
height: 0.45rem;
|
||||
padding: 0;
|
||||
border: none;
|
||||
border-radius: 50%;
|
||||
background: rgba(168, 88, 120, 0.25);
|
||||
cursor: pointer;
|
||||
transition: transform 0.2s ease, background 0.2s ease;
|
||||
}
|
||||
|
||||
.detail-recommend-dot:hover {
|
||||
background: rgba(168, 88, 120, 0.45);
|
||||
}
|
||||
|
||||
.detail-recommend-dot.is-active {
|
||||
background: #a85878;
|
||||
transform: scale(1.25);
|
||||
}
|
||||
|
||||
@media (min-width: 768px) {
|
||||
.detail-recommend-slide {
|
||||
flex: 0 0 50%;
|
||||
}
|
||||
|
||||
.detail-adjacent-title {
|
||||
font-size: 0.92rem;
|
||||
-webkit-line-clamp: 1;
|
||||
}
|
||||
}
|
||||
|
||||
@media (max-width: 767.98px) {
|
||||
.detail-adjacent-bar {
|
||||
flex-direction: column;
|
||||
gap: 0.65rem;
|
||||
}
|
||||
|
||||
.detail-adjacent-side-next {
|
||||
text-align: left;
|
||||
justify-content: flex-start;
|
||||
flex-direction: row-reverse;
|
||||
}
|
||||
|
||||
.detail-adjacent-side-prev {
|
||||
flex-direction: row;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,459 @@
|
||||
/**
|
||||
* 帖子/新闻列表共用:粉色毛玻璃分段板块 + 横向卡片
|
||||
* 用于首页 .home-posts 与独立列表页 .feed-list-page
|
||||
*/
|
||||
|
||||
.home-posts,
|
||||
.feed-list-page {
|
||||
--post-accent: #fdbbdb;
|
||||
--post-accent-deep: #f0a8c4;
|
||||
--post-accent-text: #a85878;
|
||||
--post-accent-muted: #c97a96;
|
||||
--post-accent-bg: rgba(253, 189, 219, 0.48);
|
||||
}
|
||||
|
||||
/* ---------- 板块栏(强制单行:左箭头 | 可滚动 Tab | 右箭头) ---------- */
|
||||
.home-posts-board-bar,
|
||||
.feed-list-page .feed-board-bar {
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
flex-wrap: nowrap;
|
||||
align-items: center;
|
||||
justify-content: flex-start;
|
||||
gap: 0.5rem;
|
||||
margin-bottom: 1.25rem;
|
||||
width: 100%;
|
||||
max-width: 100%;
|
||||
min-width: 0;
|
||||
box-sizing: border-box;
|
||||
}
|
||||
|
||||
.home-posts-segment-outer,
|
||||
.feed-list-page .feed-segment-outer {
|
||||
flex: 1 1 0%;
|
||||
min-width: 0;
|
||||
width: 0;
|
||||
display: block;
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
.home-posts-segment,
|
||||
.feed-list-page .feed-segment {
|
||||
position: relative;
|
||||
display: flex;
|
||||
width: 100%;
|
||||
max-width: 100%;
|
||||
min-width: 0;
|
||||
box-sizing: border-box;
|
||||
padding: 4px;
|
||||
border-radius: 999px;
|
||||
background: rgba(255, 255, 255, 0.28);
|
||||
backdrop-filter: blur(18px);
|
||||
-webkit-backdrop-filter: blur(18px);
|
||||
border: 1px solid rgba(255, 255, 255, 0.5);
|
||||
box-shadow:
|
||||
0 4px 20px rgba(253, 189, 219, 0.12),
|
||||
inset 0 1px 0 rgba(255, 255, 255, 0.35);
|
||||
}
|
||||
|
||||
.home-posts-spotlight,
|
||||
.feed-list-page .feed-spotlight {
|
||||
position: absolute;
|
||||
top: 4px;
|
||||
bottom: 4px;
|
||||
left: 0;
|
||||
width: var(--spot-w, 4rem);
|
||||
border-radius: 999px;
|
||||
background: var(--post-accent-bg);
|
||||
border: 1px solid rgba(240, 168, 196, 0.55);
|
||||
box-shadow: 0 2px 14px rgba(253, 189, 219, 0.35);
|
||||
transform: translateX(var(--spot-l, 0));
|
||||
transition:
|
||||
transform 0.28s cubic-bezier(0.34, 1.2, 0.64, 1),
|
||||
width 0.28s cubic-bezier(0.34, 1.2, 0.64, 1);
|
||||
pointer-events: none;
|
||||
z-index: 0;
|
||||
}
|
||||
|
||||
.home-posts-tabs-scroll,
|
||||
.feed-list-page .feed-tabs-scroll {
|
||||
position: relative;
|
||||
z-index: 1;
|
||||
width: 100%;
|
||||
min-width: 0;
|
||||
overflow-x: auto;
|
||||
overflow-y: hidden;
|
||||
max-width: 100%;
|
||||
scroll-behavior: smooth;
|
||||
-ms-overflow-style: none;
|
||||
scrollbar-width: none;
|
||||
mask-image: linear-gradient(
|
||||
to right,
|
||||
transparent,
|
||||
#000 12px,
|
||||
#000 calc(100% - 12px),
|
||||
transparent
|
||||
);
|
||||
}
|
||||
|
||||
.home-posts-tabs-scroll::-webkit-scrollbar,
|
||||
.feed-list-page .feed-tabs-scroll::-webkit-scrollbar {
|
||||
display: none;
|
||||
}
|
||||
|
||||
.home-posts-tabs,
|
||||
.feed-list-page .feed-tabs {
|
||||
display: flex;
|
||||
flex-wrap: nowrap;
|
||||
gap: 2px;
|
||||
padding: 0 2px;
|
||||
}
|
||||
|
||||
.home-posts-tab,
|
||||
.feed-list-page .feed-tab {
|
||||
flex-shrink: 0;
|
||||
padding: 0.4rem 1rem;
|
||||
border-radius: 999px;
|
||||
font-size: 0.8125rem;
|
||||
font-weight: 500;
|
||||
text-decoration: none;
|
||||
color: #555;
|
||||
background: transparent;
|
||||
border: 1px solid transparent;
|
||||
transition: color 0.2s ease;
|
||||
white-space: nowrap;
|
||||
}
|
||||
|
||||
.home-posts-tab:hover,
|
||||
.feed-list-page .feed-tab:hover {
|
||||
color: var(--post-accent-text);
|
||||
}
|
||||
|
||||
.home-posts-tab.active,
|
||||
.feed-list-page .feed-tab.active {
|
||||
color: var(--post-accent-text);
|
||||
font-weight: 600;
|
||||
}
|
||||
|
||||
.home-posts-tab-more {
|
||||
background: rgba(253, 189, 219, 0.32);
|
||||
border-color: rgba(253, 189, 219, 0.45);
|
||||
color: var(--post-accent-text);
|
||||
}
|
||||
|
||||
.home-posts-tab-more:hover {
|
||||
background: rgba(253, 189, 219, 0.48);
|
||||
color: var(--post-accent-text);
|
||||
}
|
||||
|
||||
.home-posts-scroll,
|
||||
.feed-list-page .feed-scroll {
|
||||
flex: 0 0 32px;
|
||||
width: 32px;
|
||||
min-width: 32px;
|
||||
max-width: 32px;
|
||||
height: 32px;
|
||||
padding: 0;
|
||||
margin: 0;
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
border: 1px solid rgba(255, 255, 255, 0.5);
|
||||
border-radius: 50%;
|
||||
background: rgba(255, 255, 255, 0.35);
|
||||
backdrop-filter: blur(10px);
|
||||
color: var(--post-accent-text);
|
||||
cursor: pointer;
|
||||
transition: background 0.2s, transform 0.2s, opacity 0.2s;
|
||||
box-sizing: border-box;
|
||||
-webkit-appearance: none;
|
||||
appearance: none;
|
||||
}
|
||||
|
||||
.home-posts-scroll:hover,
|
||||
.feed-list-page .feed-scroll:hover {
|
||||
background: rgba(253, 189, 219, 0.35);
|
||||
transform: scale(1.05);
|
||||
}
|
||||
|
||||
.home-posts-scroll:disabled,
|
||||
.home-posts-scroll.is-hidden,
|
||||
.feed-list-page .feed-scroll.is-hidden {
|
||||
opacity: 0.3;
|
||||
pointer-events: none;
|
||||
transform: none;
|
||||
/* 仍占位,避免板块栏折行 */
|
||||
visibility: visible;
|
||||
flex: 0 0 32px;
|
||||
width: 32px;
|
||||
min-width: 32px;
|
||||
}
|
||||
|
||||
/* ---------- 帖子卡片列表 ---------- */
|
||||
.home-posts-list,
|
||||
.feed-list-page .feed-posts-list {
|
||||
list-style: none;
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 0.65rem;
|
||||
}
|
||||
|
||||
.home-post-card,
|
||||
.feed-list-page .feed-post-card {
|
||||
border-radius: 14px;
|
||||
background: rgba(255, 255, 255, 0.32);
|
||||
backdrop-filter: blur(12px);
|
||||
-webkit-backdrop-filter: blur(12px);
|
||||
border: 1px solid rgba(255, 255, 255, 0.42);
|
||||
box-shadow: 0 4px 16px rgba(253, 189, 219, 0.08);
|
||||
transition: transform 0.2s ease, box-shadow 0.2s ease, background 0.2s ease;
|
||||
}
|
||||
|
||||
.home-post-card:hover,
|
||||
.feed-list-page .feed-post-card:hover {
|
||||
transform: translateY(-2px);
|
||||
background: rgba(255, 255, 255, 0.42);
|
||||
box-shadow: 0 8px 24px rgba(253, 189, 219, 0.18);
|
||||
}
|
||||
|
||||
.home-post-card-link,
|
||||
.feed-list-page .feed-post-card-link {
|
||||
display: grid;
|
||||
grid-template-columns: auto 1fr auto;
|
||||
align-items: center;
|
||||
gap: 0.75rem 1rem;
|
||||
padding: 0.75rem 1rem;
|
||||
text-decoration: none;
|
||||
color: inherit;
|
||||
}
|
||||
|
||||
.home-post-board,
|
||||
.feed-list-page .feed-post-board {
|
||||
flex-shrink: 0;
|
||||
padding: 0.2rem 0.55rem;
|
||||
border-radius: 6px;
|
||||
font-size: 0.6875rem;
|
||||
font-weight: 600;
|
||||
color: var(--post-accent-text);
|
||||
background: rgba(253, 189, 219, 0.28);
|
||||
white-space: nowrap;
|
||||
max-width: 5rem;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
}
|
||||
|
||||
.home-post-body,
|
||||
.feed-list-page .feed-post-body {
|
||||
min-width: 0;
|
||||
}
|
||||
|
||||
.home-post-title,
|
||||
.feed-list-page .feed-post-title {
|
||||
margin: 0 0 0.3rem;
|
||||
font-size: 0.9375rem;
|
||||
font-weight: 600;
|
||||
color: #222;
|
||||
line-height: 1.35;
|
||||
display: -webkit-box;
|
||||
-webkit-box-orient: vertical;
|
||||
-webkit-line-clamp: 1;
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
.home-post-meta,
|
||||
.feed-list-page .feed-post-meta {
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
align-items: center;
|
||||
gap: 0.5rem 0.85rem;
|
||||
font-size: 0.75rem;
|
||||
color: #666;
|
||||
}
|
||||
|
||||
.home-post-meta-item,
|
||||
.feed-list-page .feed-post-meta-item {
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
gap: 0.25rem;
|
||||
}
|
||||
|
||||
.home-post-meta i,
|
||||
.feed-list-page .feed-post-meta i {
|
||||
font-size: 0.7rem;
|
||||
opacity: 0.75;
|
||||
}
|
||||
|
||||
.home-post-meta time,
|
||||
.feed-list-page .feed-post-meta time {
|
||||
color: var(--post-accent-muted);
|
||||
}
|
||||
|
||||
.home-post-arrow,
|
||||
.feed-list-page .feed-post-arrow {
|
||||
color: rgba(253, 189, 219, 0.9);
|
||||
font-size: 0.75rem;
|
||||
opacity: 0.7;
|
||||
transition: opacity 0.2s, transform 0.2s;
|
||||
}
|
||||
|
||||
.home-post-card:hover .home-post-arrow,
|
||||
.feed-list-page .feed-post-card:hover .feed-post-arrow {
|
||||
opacity: 1;
|
||||
transform: translateX(2px);
|
||||
}
|
||||
|
||||
.home-posts-empty,
|
||||
.feed-list-page .feed-empty {
|
||||
text-align: center;
|
||||
padding: 2rem;
|
||||
color: #666;
|
||||
}
|
||||
|
||||
.home-posts-more-link {
|
||||
display: block;
|
||||
width: fit-content;
|
||||
margin: 1rem auto 0;
|
||||
padding: 0.45rem 1.25rem;
|
||||
border-radius: 999px;
|
||||
font-size: 0.8125rem;
|
||||
font-weight: 600;
|
||||
text-decoration: none;
|
||||
color: var(--post-accent-text);
|
||||
background: rgba(253, 189, 219, 0.35);
|
||||
border: 1px solid rgba(253, 189, 219, 0.55);
|
||||
transition: background 0.2s, box-shadow 0.2s;
|
||||
}
|
||||
|
||||
.home-posts-more-link:hover {
|
||||
background: rgba(253, 189, 219, 0.5);
|
||||
box-shadow: 0 4px 14px rgba(253, 189, 219, 0.25);
|
||||
}
|
||||
|
||||
/* ---------- 新闻列表卡片(横向胶囊风格,静态列表) ---------- */
|
||||
.feed-list-page .feed-news-list {
|
||||
list-style: none;
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 0.65rem;
|
||||
}
|
||||
|
||||
.feed-list-page .feed-news-card {
|
||||
border-radius: 14px;
|
||||
background: rgba(255, 255, 255, 0.32);
|
||||
backdrop-filter: blur(12px);
|
||||
-webkit-backdrop-filter: blur(12px);
|
||||
border: 1px solid rgba(255, 255, 255, 0.42);
|
||||
box-shadow: 0 4px 16px rgba(253, 189, 219, 0.08);
|
||||
transition: transform 0.2s ease, box-shadow 0.2s ease, background 0.2s ease;
|
||||
}
|
||||
|
||||
.feed-list-page .feed-news-card:hover {
|
||||
transform: translateY(-2px);
|
||||
background: rgba(255, 255, 255, 0.42);
|
||||
box-shadow: 0 8px 24px rgba(253, 189, 219, 0.18);
|
||||
}
|
||||
|
||||
.feed-list-page .feed-news-card-link {
|
||||
display: grid;
|
||||
grid-template-columns: auto 1fr auto;
|
||||
align-items: center;
|
||||
gap: 0.75rem 1rem;
|
||||
padding: 0.75rem 1rem;
|
||||
text-decoration: none;
|
||||
color: inherit;
|
||||
}
|
||||
|
||||
.feed-list-page .feed-news-side {
|
||||
flex-shrink: 0;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
align-items: flex-start;
|
||||
gap: 0.15rem;
|
||||
padding-right: 0.65rem;
|
||||
border-right: 1px solid rgba(253, 189, 219, 0.35);
|
||||
min-width: 4.5rem;
|
||||
}
|
||||
|
||||
.feed-list-page .feed-news-date {
|
||||
font-size: 0.6875rem;
|
||||
font-weight: 700;
|
||||
color: var(--post-accent-muted);
|
||||
white-space: nowrap;
|
||||
}
|
||||
|
||||
.feed-list-page .feed-news-board {
|
||||
font-size: 0.625rem;
|
||||
font-weight: 600;
|
||||
color: var(--post-accent-text);
|
||||
background: rgba(253, 189, 219, 0.22);
|
||||
padding: 0.12rem 0.35rem;
|
||||
border-radius: 3px;
|
||||
max-width: 5.5rem;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
white-space: nowrap;
|
||||
}
|
||||
|
||||
@media (max-width: 576px) {
|
||||
.home-posts-board-bar,
|
||||
.feed-list-page .feed-board-bar {
|
||||
gap: 0.35rem;
|
||||
}
|
||||
|
||||
.home-posts-scroll,
|
||||
.feed-list-page .feed-scroll {
|
||||
flex: 0 0 28px;
|
||||
width: 28px;
|
||||
min-width: 28px;
|
||||
max-width: 28px;
|
||||
height: 28px;
|
||||
font-size: 0.7rem;
|
||||
}
|
||||
|
||||
.home-posts-scroll.is-hidden,
|
||||
.feed-list-page .feed-scroll.is-hidden {
|
||||
flex: 0 0 28px;
|
||||
width: 28px;
|
||||
min-width: 28px;
|
||||
}
|
||||
|
||||
.home-posts-tab,
|
||||
.feed-list-page .feed-tab {
|
||||
padding: 0.35rem 0.7rem;
|
||||
font-size: 0.75rem;
|
||||
}
|
||||
|
||||
.home-post-card-link,
|
||||
.feed-list-page .feed-post-card-link,
|
||||
.feed-list-page .feed-news-card-link {
|
||||
grid-template-columns: 1fr auto;
|
||||
grid-template-rows: auto auto;
|
||||
}
|
||||
|
||||
.home-post-board,
|
||||
.feed-list-page .feed-post-board,
|
||||
.feed-list-page .feed-news-side {
|
||||
grid-column: 1;
|
||||
justify-self: start;
|
||||
border-right: none;
|
||||
padding-right: 0;
|
||||
flex-direction: row;
|
||||
gap: 0.35rem;
|
||||
}
|
||||
|
||||
.home-post-body,
|
||||
.feed-list-page .feed-post-body {
|
||||
grid-column: 1;
|
||||
}
|
||||
|
||||
.home-post-arrow,
|
||||
.feed-list-page .feed-post-arrow {
|
||||
grid-column: 2;
|
||||
grid-row: 1 / span 2;
|
||||
align-self: center;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,116 @@
|
||||
/**
|
||||
* 帖子/新闻独立列表页布局(与首页 section-wrap 宽度一致)
|
||||
* 不依赖 index.css(首页 hero/notice 专用)
|
||||
*/
|
||||
|
||||
section.feed-list-page {
|
||||
height: auto;
|
||||
min-height: 0;
|
||||
box-sizing: border-box;
|
||||
}
|
||||
|
||||
.feed-list-page {
|
||||
padding: 2rem 0 3rem;
|
||||
}
|
||||
|
||||
.feed-list-page .section-wrap.feed-list-stage {
|
||||
display: block;
|
||||
width: 90%;
|
||||
max-width: none;
|
||||
margin-left: auto;
|
||||
margin-right: auto;
|
||||
box-sizing: border-box;
|
||||
background-color: rgba(255, 255, 255, 0.14);
|
||||
border: 1px solid rgba(255, 255, 255, 0.2);
|
||||
box-shadow: inset 0 0 5px rgba(255, 255, 255, 0.1);
|
||||
border-radius: 30px;
|
||||
backdrop-filter: blur(12px);
|
||||
padding: 2rem 2.5rem 2.5rem;
|
||||
height: auto;
|
||||
min-height: 0;
|
||||
max-height: none;
|
||||
overflow: visible;
|
||||
}
|
||||
|
||||
.feed-list-body {
|
||||
width: 100%;
|
||||
overflow: visible;
|
||||
}
|
||||
|
||||
.feed-list-title {
|
||||
margin: 0 0 1.25rem;
|
||||
font-size: 1.5rem;
|
||||
font-weight: 600;
|
||||
color: #111;
|
||||
text-align: center;
|
||||
border-bottom: 1px solid rgba(255, 255, 255, 0.45);
|
||||
padding-bottom: 0.65rem;
|
||||
}
|
||||
|
||||
.feed-list-actions {
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
margin-bottom: 1rem;
|
||||
}
|
||||
|
||||
.feed-list-actions .feed-action-link {
|
||||
padding: 0.4rem 1rem;
|
||||
border-radius: 999px;
|
||||
font-size: 0.8125rem;
|
||||
font-weight: 600;
|
||||
text-decoration: none;
|
||||
color: var(--post-accent-text);
|
||||
background: rgba(253, 189, 219, 0.35);
|
||||
border: 1px solid rgba(253, 189, 219, 0.55);
|
||||
transition: background 0.2s, box-shadow 0.2s;
|
||||
}
|
||||
|
||||
.feed-list-actions .feed-action-link:hover {
|
||||
background: rgba(253, 189, 219, 0.5);
|
||||
box-shadow: 0 4px 14px rgba(253, 189, 219, 0.25);
|
||||
}
|
||||
|
||||
.feed-list-page .feed-pagination {
|
||||
margin-top: 1.5rem;
|
||||
}
|
||||
|
||||
.feed-list-page .feed-pagination .page-link {
|
||||
color: var(--post-accent-text);
|
||||
background: rgba(255, 255, 255, 0.32);
|
||||
backdrop-filter: blur(10px);
|
||||
border: 1px solid rgba(253, 189, 219, 0.4);
|
||||
border-radius: 8px;
|
||||
margin: 0 0.2rem;
|
||||
transition: background 0.2s;
|
||||
}
|
||||
|
||||
.feed-list-page .feed-pagination .page-link:hover {
|
||||
background: rgba(253, 189, 219, 0.35);
|
||||
}
|
||||
|
||||
.feed-list-page .feed-pagination .page-item.active .page-link {
|
||||
background: rgba(253, 189, 219, 0.55);
|
||||
border-color: rgba(240, 168, 196, 0.75);
|
||||
color: var(--post-accent-text);
|
||||
font-weight: 600;
|
||||
}
|
||||
|
||||
@media (max-width: 768px) {
|
||||
section.feed-list-page,
|
||||
.feed-list-page {
|
||||
padding: 16px 0;
|
||||
}
|
||||
|
||||
.feed-list-page .section-wrap.feed-list-stage {
|
||||
width: 95%;
|
||||
border-radius: 20px;
|
||||
padding: 1.25rem 1.5rem 1.75rem;
|
||||
}
|
||||
}
|
||||
|
||||
@media (max-width: 576px) {
|
||||
.feed-list-page .section-wrap.feed-list-stage {
|
||||
width: 98%;
|
||||
padding: 1rem 1.15rem 1.5rem;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,251 @@
|
||||
/* 全站页脚:白色毛玻璃,与导航/首页区块风格一致 */
|
||||
.site-footer {
|
||||
margin-top: 2rem;
|
||||
padding: 2.25rem 1.5rem 2.75rem;
|
||||
background: rgba(255, 255, 255, 0.28);
|
||||
backdrop-filter: blur(14px);
|
||||
-webkit-backdrop-filter: blur(14px);
|
||||
border-top: 1px solid rgba(255, 255, 255, 0.45);
|
||||
box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.35);
|
||||
color: #333;
|
||||
}
|
||||
|
||||
.site-footer-inner {
|
||||
max-width: 1000px;
|
||||
margin: 0 auto;
|
||||
display: grid;
|
||||
grid-template-columns: 1fr 1fr;
|
||||
gap: 2rem 3rem;
|
||||
align-items: start;
|
||||
}
|
||||
|
||||
.footer-col {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
align-items: center;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
/* ---------- 左栏:站点信息(居中 + 字号层级) ---------- */
|
||||
.footer-site-logo {
|
||||
border-radius: 50%;
|
||||
object-fit: cover;
|
||||
margin-bottom: 0.5rem;
|
||||
}
|
||||
|
||||
.footer-site-name {
|
||||
margin: 0 0 0.35rem;
|
||||
font-size: 1.25rem;
|
||||
font-weight: 700;
|
||||
color: #111;
|
||||
letter-spacing: 0.02em;
|
||||
}
|
||||
|
||||
.footer-site-tagline {
|
||||
margin: 0 0 0.75rem;
|
||||
font-size: 0.8125rem;
|
||||
font-weight: 400;
|
||||
color: #555;
|
||||
line-height: 1.5;
|
||||
max-width: 22rem;
|
||||
}
|
||||
|
||||
.footer-copy {
|
||||
margin: 0 0 0.5rem;
|
||||
font-size: 0.9375rem;
|
||||
font-weight: 500;
|
||||
color: #444;
|
||||
}
|
||||
|
||||
.footer-meta-sm {
|
||||
margin: 0.2rem 0;
|
||||
font-size: 0.8125rem;
|
||||
color: #666;
|
||||
line-height: 1.45;
|
||||
}
|
||||
|
||||
.footer-meta-label {
|
||||
display: inline;
|
||||
margin-right: 0.35rem;
|
||||
font-size: 0.75rem;
|
||||
color: #888;
|
||||
}
|
||||
|
||||
.footer-meta-label::after {
|
||||
content: ":";
|
||||
}
|
||||
|
||||
.footer-col-site a {
|
||||
color: #2a5db0;
|
||||
text-decoration: none;
|
||||
}
|
||||
|
||||
.footer-col-site a:hover {
|
||||
color: #0d47a1;
|
||||
text-decoration: underline;
|
||||
}
|
||||
|
||||
.footer-api-guide {
|
||||
margin-top: 0.45rem;
|
||||
}
|
||||
|
||||
.footer-guide-btn {
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
gap: 0.35rem;
|
||||
padding: 0.28rem 0.65rem;
|
||||
font-size: 0.75rem;
|
||||
font-weight: 600;
|
||||
color: #555 !important;
|
||||
text-decoration: none !important;
|
||||
background: rgba(255, 255, 255, 0.45);
|
||||
border: 1px solid rgba(0, 0, 0, 0.08);
|
||||
border-radius: 999px;
|
||||
transition: background 0.2s ease, color 0.2s ease, border-color 0.2s ease;
|
||||
}
|
||||
|
||||
.footer-guide-btn:hover {
|
||||
color: #2a5db0 !important;
|
||||
background: rgba(255, 255, 255, 0.75);
|
||||
border-color: rgba(42, 93, 176, 0.25);
|
||||
}
|
||||
|
||||
.footer-guide-btn .anlian-icon {
|
||||
font-size: 0.7rem;
|
||||
opacity: 0.85;
|
||||
}
|
||||
|
||||
.footer-beian {
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
justify-content: center;
|
||||
gap: 0.35rem 0.85rem;
|
||||
margin-top: 0.65rem;
|
||||
}
|
||||
|
||||
.footer-beian-link {
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
gap: 0.3rem;
|
||||
font-size: 0.75rem;
|
||||
color: #777 !important;
|
||||
text-decoration: none;
|
||||
}
|
||||
|
||||
.footer-beian-link:hover {
|
||||
color: #333 !important;
|
||||
text-decoration: underline;
|
||||
}
|
||||
|
||||
.beian-icon {
|
||||
vertical-align: middle;
|
||||
}
|
||||
|
||||
/* ---------- 右栏:作者(头像在上,信息居中,无卡片) ---------- */
|
||||
.footer-col-author {
|
||||
gap: 0.65rem;
|
||||
}
|
||||
|
||||
.footer-author-avatar {
|
||||
width: 72px;
|
||||
height: 72px;
|
||||
border-radius: 50%;
|
||||
object-fit: cover;
|
||||
border: 2px solid rgba(255, 255, 255, 0.85);
|
||||
box-shadow: 0 2px 12px rgba(0, 0, 0, 0.08);
|
||||
}
|
||||
|
||||
.footer-author-info {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
align-items: center;
|
||||
gap: 0.2rem;
|
||||
width: 100%;
|
||||
max-width: 16rem;
|
||||
}
|
||||
|
||||
.footer-author-name {
|
||||
margin: 0;
|
||||
font-size: 1.125rem;
|
||||
font-weight: 700;
|
||||
color: #111;
|
||||
}
|
||||
|
||||
.footer-author-name a {
|
||||
color: #111;
|
||||
text-decoration: none;
|
||||
}
|
||||
|
||||
.footer-author-name a:hover {
|
||||
color: #111;
|
||||
text-decoration: underline;
|
||||
}
|
||||
|
||||
.footer-author-title {
|
||||
margin: 0;
|
||||
font-size: 0.875rem;
|
||||
color: #666;
|
||||
}
|
||||
|
||||
.footer-author-meta {
|
||||
margin: 0.1rem 0;
|
||||
font-size: 0.8125rem;
|
||||
color: #555;
|
||||
}
|
||||
|
||||
.footer-author-meta a {
|
||||
color: #555;
|
||||
text-decoration: none;
|
||||
word-break: break-all;
|
||||
}
|
||||
|
||||
.footer-author-meta a:hover {
|
||||
color: #333;
|
||||
text-decoration: underline;
|
||||
}
|
||||
|
||||
/* 个人主页:白色加粗,悬浮白色下划线(与全站毛玻璃主题一致) */
|
||||
.footer-author-home a {
|
||||
color: #fff;
|
||||
font-weight: 700;
|
||||
text-decoration: none;
|
||||
text-shadow: 0 1px 3px rgba(0, 0, 0, 0.35);
|
||||
}
|
||||
|
||||
.footer-author-home a:hover,
|
||||
.footer-author-home a:focus-visible {
|
||||
color: #fff;
|
||||
text-decoration: underline;
|
||||
text-decoration-color: #fff;
|
||||
text-underline-offset: 0.2em;
|
||||
}
|
||||
|
||||
/* ---------- 首页与其它页面共用 ---------- */
|
||||
.page-home .main-container {
|
||||
max-width: none;
|
||||
width: 100%;
|
||||
padding: 0;
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
|
||||
.hero .social a {
|
||||
color: inherit;
|
||||
text-decoration: none;
|
||||
}
|
||||
|
||||
.hero .social a:hover {
|
||||
opacity: 0.85;
|
||||
}
|
||||
|
||||
@media (max-width: 767.98px) {
|
||||
.site-footer-inner {
|
||||
grid-template-columns: 1fr;
|
||||
gap: 2rem;
|
||||
}
|
||||
|
||||
.footer-col-author {
|
||||
padding-top: 0.5rem;
|
||||
border-top: 1px solid rgba(0, 0, 0, 0.06);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,17 @@
|
||||
.anlian-icon {
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
width: 1em;
|
||||
height: 1em;
|
||||
vertical-align: -0.125em;
|
||||
fill: currentColor;
|
||||
flex-shrink: 0;
|
||||
line-height: 1;
|
||||
}
|
||||
|
||||
.anlian-icon svg {
|
||||
display: block;
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
}
|
||||
@@ -0,0 +1,180 @@
|
||||
/* ========== 原有基础样式保留(略作优化) ========== */
|
||||
/* 针对section的css样式 */
|
||||
section,
|
||||
.right,
|
||||
.left,
|
||||
.social,
|
||||
.social .anlian-icon {
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
}
|
||||
|
||||
section {
|
||||
height: 100vh;
|
||||
/* 新增:确保小屏幕也能完整显示内容,避免溢出 */
|
||||
min-height: 600px;
|
||||
padding: 20px 0;
|
||||
box-sizing: border-box;
|
||||
}
|
||||
|
||||
.section-wrap {
|
||||
background-color: rgba(255, 255, 255, 0.2);
|
||||
height: 80vh;
|
||||
min-height: 500px; /* 新增:最小高度,避免小屏幕塌陷 */
|
||||
width: 90%;
|
||||
border: 1px solid rgba(255, 255, 255, 0.2);
|
||||
box-shadow: inset 0 0 5px rgba(255, 255, 255, 0.1);
|
||||
border-radius: 30px;
|
||||
backdrop-filter: blur(12px);
|
||||
padding: 50px 100px;
|
||||
overflow: hidden;
|
||||
box-sizing: border-box; /* 新增:内边距计入宽度 */
|
||||
}
|
||||
|
||||
@media (max-width: 992px) {
|
||||
.section-wrap {
|
||||
padding: 30px 50px; /* 减小内边距 */
|
||||
height: 85vh; /* 增加高度占比,容纳内容 */
|
||||
}
|
||||
}
|
||||
|
||||
@media (max-width: 768px) {
|
||||
section {
|
||||
height: auto; /* 取消固定高度,自适应内容 */
|
||||
min-height: 100vh; /* 确保至少占满视窗 */
|
||||
padding: 40px 0;
|
||||
}
|
||||
|
||||
.section-wrap {
|
||||
height: auto; /* 取消固定高度 */
|
||||
/* min-height: auto; */
|
||||
padding: 20px 30px;
|
||||
width: 95%; /* 增加宽度占比 */
|
||||
border-radius: 20px; /* 减小圆角,适配小屏 */
|
||||
}
|
||||
}
|
||||
|
||||
@media (max-width: 576px) {
|
||||
.section-wrap {
|
||||
padding: 15px 20px;
|
||||
width: 98%;
|
||||
}
|
||||
}
|
||||
|
||||
/* 内容型区块:取消 100vh + flex 居中,避免列表被压扁裁切(桌面端亦生效) */
|
||||
section.feed-list-page,
|
||||
.page-home section.home-posts,
|
||||
.page-home section.home-news {
|
||||
height: auto;
|
||||
min-height: 0;
|
||||
align-items: stretch;
|
||||
justify-content: flex-start;
|
||||
}
|
||||
|
||||
/* 公告 / 新闻 / 帖子 / 列表页:统一宽度 */
|
||||
.page-home section.notice > .section-wrap,
|
||||
.page-home section.home-news > .section-wrap,
|
||||
.page-home section.home-posts > .section-wrap,
|
||||
section.feed-list-page > .section-wrap.feed-list-stage {
|
||||
width: 90%;
|
||||
max-width: none;
|
||||
margin-left: auto;
|
||||
margin-right: auto;
|
||||
box-sizing: border-box;
|
||||
}
|
||||
|
||||
/* 公告:保留轮播区高度(勿用 min-height:0,否则绝对定位容器坍塌) */
|
||||
.page-home section.notice > .section-wrap {
|
||||
position: relative;
|
||||
min-height: clamp(380px, 52vh, 560px);
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
/* 新闻 / 帖子 / 列表:高度随内容,覆盖全局 80vh + overflow:hidden */
|
||||
.page-home section.home-news > .section-wrap,
|
||||
.page-home section.home-posts > .section-wrap,
|
||||
section.feed-list-page > .section-wrap.feed-list-stage {
|
||||
height: auto;
|
||||
min-height: 0;
|
||||
max-height: none;
|
||||
overflow: visible;
|
||||
}
|
||||
|
||||
/* 首页 Hero:全屏感 + 与其它区块统一宽度 */
|
||||
.page-home section.hero {
|
||||
height: auto;
|
||||
min-height: 100vh;
|
||||
align-items: stretch;
|
||||
padding: 20px 0;
|
||||
}
|
||||
|
||||
.page-home section.hero > .section-wrap {
|
||||
width: 90%;
|
||||
max-width: none;
|
||||
margin-left: auto;
|
||||
margin-right: auto;
|
||||
height: auto;
|
||||
min-height: clamp(520px, 82vh, 760px);
|
||||
overflow: visible;
|
||||
box-sizing: border-box;
|
||||
}
|
||||
|
||||
@media (max-width: 1024px) {
|
||||
.page-home section.hero {
|
||||
min-height: auto;
|
||||
padding: 16px 0;
|
||||
}
|
||||
|
||||
.page-home section.hero > .section-wrap {
|
||||
min-height: clamp(460px, 75vh, 680px);
|
||||
padding: 28px 40px;
|
||||
}
|
||||
}
|
||||
|
||||
@media (max-width: 768px) {
|
||||
.page-home section.hero,
|
||||
.page-home section.home-posts,
|
||||
.page-home section.home-news,
|
||||
.page-home section.notice,
|
||||
section.feed-list-page {
|
||||
min-height: auto;
|
||||
padding: 16px 0;
|
||||
}
|
||||
|
||||
.page-home section.notice > .section-wrap,
|
||||
.page-home section.home-news > .section-wrap,
|
||||
.page-home section.home-posts > .section-wrap,
|
||||
section.feed-list-page > .section-wrap.feed-list-stage,
|
||||
.page-home section.hero > .section-wrap {
|
||||
width: 95%;
|
||||
}
|
||||
|
||||
.page-home section.hero > .section-wrap {
|
||||
min-height: auto;
|
||||
padding: 20px 24px;
|
||||
}
|
||||
|
||||
.page-home section.notice > .section-wrap {
|
||||
min-height: clamp(340px, 58vh, 480px);
|
||||
}
|
||||
}
|
||||
|
||||
@media (max-width: 576px) {
|
||||
.page-home section.notice > .section-wrap,
|
||||
.page-home section.home-news > .section-wrap,
|
||||
.page-home section.home-posts > .section-wrap,
|
||||
section.feed-list-page > .section-wrap.feed-list-stage,
|
||||
.page-home section.hero > .section-wrap {
|
||||
width: 98%;
|
||||
}
|
||||
|
||||
.page-home section.hero > .section-wrap {
|
||||
padding: 16px 18px;
|
||||
border-radius: 20px;
|
||||
}
|
||||
|
||||
.page-home section.notice > .section-wrap {
|
||||
min-height: clamp(300px, 62vh, 420px);
|
||||
}
|
||||
}
|
||||
Loaded 100 of 732 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user