原计划的"翻转默认 + 旧形硬报错"不可行:`[键](集合)` 与 `[描述](实现)` 外形相同, 翻转会让 506 处取元静默变义,硬报错又拿不到证据。改为**按文件声明**。 一、per-file markup - frontmatter `markup: occlusion`(或 `标记: 遮蔽`)决定该文件模式 - load.rs 先取模式,用 parse::expr::with_markup(线程局部压栈)包住解析 - 同一进程可同时加载两种模式的文件(imports);MARQDO_MARKUP 仍作进程默认 - 好处:迁移逐文件、可增量、可回滚,不存在半迁移的静默错义 二、`marqdo migrate labels [--write|--json]` 改写规则: [键](集合) → [键](access(集合, "键")) [`名`](集合) → [名](access(集合, `名`)) - [项](集合) → - [项](遍历 集合 为 项) 安全模型:改写 → 重解析 → 证明等价 → 才写 - 原文件按 classic 解析得 AST-A;改写后按 occlusion 解析得 AST-B - 反归一化 B(标签与键同名且 payload 为 access 的遮蔽还原成 Index) - Debug(A) == Debug(反归一化(B))(抹掉行号)才写入,否则原文件一字不动 只改代码行(LineKind::Code);表格行只改 **…** 单元格,散文 markdown 链接不碰; 链式索引由内向外改写,已迁移的有守卫不二次改。 三、access 提升为宿主函数 HostFn::Access(u16 id 212) 与旧取元逐字一致(Map 按键 / List 1-based / 缺键 missing map key); 进 HostFn 是为了两个后端共用同一实现,interp 里的特例已删除。 四、顺带修的两处真实语义缺陷 1. payload 继承外层"文本模式":`f text=[k](access(c,k))` 中 access 不被当调用 → `()` 内永远允许 callee(args) 2. 遮蔽形状判定过宽:`[问候] ([格式化] "Bo")` 误判为遮蔽 → 要求 `]` 后紧跟 `(`,否则落回方括号调用 五、全仓迁移结果 migrate labels: 256 index, 23 loop, 80 file written;0 文件被等价性拒绝; 迁移后 cargo test --release → 604 passed / 0 failed;再跑迁移幂等。 等价性检查先后抓出 4 类改写 bug(表格散文链接、payload 文本模式、链式索引、 遮蔽与方括号调用混淆),每类都是先拦下再修工具,未污染文件。 测试:6 个单测 + 3 个集成(干跑不写盘 / 写入后运行输出不变且幂等 / 等价失败文件不动);全量 604 passed / 0 failed(M3 后 595 + 9);双后端一致。 文档:doc/design/change-m7-migration.md
6.4 KiB
markup: occlusion title: browser-app (route E+) description: list CRUD, storage, navigate, interval, fetch_all, ws — GFM + lib/browser import browser:lib/browser.mq.md import table:lib/table.mq.md import text:lib/text.mq.md
main
ticks = 0
bag = ""
path = "/"
ws_id = "echo"
wire =
| @ | 选择器 | 事件 | 调用 | 委托 | 值选择器 |
|---|---|---|---|---|---|
| 1 | "#add" | click | add | "#draft" | |
| 2 | "#save" | click | save_draft | "#draft" | |
| 3 | "#load" | click | load_draft | ||
| 4 | "#start-tick" | click | start_tick | ||
| 5 | "#stop-tick" | click | stop_tick | ||
| 6 | "#nav-home" | click | go_home | ||
| 7 | "#nav-about" | click | go_about | ||
| 8 | "#nav-net" | click | go_net | ||
| 9 | "window" | popstate | on_pop | ||
| 10 | "#items" | click | on_item | "button[data-id]" | |
| 11 | "#fetch-all" | click | do_fetch_all | ||
| 12 | "#ws-open" | click | ws_open | ||
| 13 | "#ws-send" | click | ws_send | "#ws-msg" | |
| 14 | "#ws-close" | click | ws_close | ||
| 15 | "#copy-log" | click | copy_log | ||
| 16 | "#dl-list" | click | dl_list |
nav =
| url | replace |
|---|---|
| / | False |
st =
| op | key | then |
|---|---|---|
| get | mq-draft | on_draft |
boot =
| wire | navigate | storage |
|---|---|---|
wire |
nav |
st |
boot
add
+ `value`=""
value!= ""bag== ""bag= value-
bag= bag + "\n" + valueparts= > text.str_split s=bag sep="\n"html= ""
- [item](遍历 parts 为 item)
item!= ""html= html + "- " + item + " <button type="button" data-id="" + item + "">删 "
ret= > browser.set_html sel="#items" html=htmlclr= > browser.set_value sel="#draft" value=""ret= > browser.merge a=ret b=clrf= > browser.focus sel="#draft" > browser.merge a=ret b=f
-
on_item
+ `data_id`=""
data_id!= ""parts= > text.str_split s=bag sep="\n"next= ""- [item](遍历 parts 为 item)
item!= ""item!=data_idnext== ""next= item-
next= next + "\n" + itembag= nextparts2= > text.str_split s=bag sep="\n"html= ""
- [item](遍历 parts2 为 item)
item!= ""html= html + "- " + item + " <button type="button" data-id="" + item + "">删 "
ret= > browser.set_html sel="#items" html=htmlmsg= "removed " + data_idt= > browser.set_text sel="#log" text=msg > browser.merge a=ret b=t
- [item](遍历 parts 为 item)
-
save_draft
+ `value`=""
st =
| op | key | value |
|---|---|---|
| set | mq-draft | value |
msg = > browser.set_text sel="#log" text="draft saved"
s = > browser.storage spec=st
> browser.merge a=msg b=s
load_draft
st =
| op | key | then |
|---|---|---|
| get | mq-draft | on_draft |
> browser.storage spec=st
on_draft
+ `ok`=True
+ `value`=""
+ `found`=False
foundret= > browser.set_value sel="#draft" value=valuemsg= > browser.set_text sel="#log" text="draft loaded" > browser.merge a=ret b=msg-
start_tick
> browser.interval ms=1000 then="on_tick" id="tick"
stop_tick
> browser.clear_interval id="tick"
on_tick
+ `ok`=True
+ `id`=""
ticks = ticks + 1
label = > str ticks
> browser.set_text sel="#tick" text=label
go_home
path = "/"
> show_path
go_about
path = "/about"
> show_path
go_net
path = "/net"
> show_path
on_pop
+ `path`=""
path = path
> show_path
show_path
hide = > table.put in=None at="hidden" value=""
show = > table.put in=None at="hidden" value=False
path== "/about"attrs=#panel-about #panel-home #panel-net showhidehide-
path== "/net"attrs=#panel-net #panel-home #panel-about showhidehide-
attrs=#panel-home #panel-about #panel-net showhidehidelabel= "path: " + pathret= > browser.set_text sel="#path" text=labela= > browser.wrap key="set_attr" value=attrsret= > browser.merge a=ret b=anav= > browser.navigate url=path> browser.merge a=ret b=nav
do_fetch_all
reqs =
| @ | url |
|---|---|
| 1 | "https://httpbin.org/uuid" |
| 2 | "https://httpbin.org/uuid" |
msg = > browser.set_text sel="#net-out" text="fetch_all…"
fa = > browser.fetch_all requests=reqs then="on_fetch_all"
> browser.merge a=msg b=fa
on_fetch_all
+ `ok`=True
+ `results`=None
> browser.set_text sel="#net-out" text="fetch_all done (see console / results in session)"
ws_open
w =
| op | id | url | then_open | then_message | then_error | then_close |
|---|---|---|---|---|---|---|
| open | ws_id |
"wss://echo.websocket.events" | on_ws_open | on_ws_msg | on_ws_err | on_ws_close |
> browser.ws spec=w
on_ws_open
+ `ok`=True
+ `id`=""
> browser.set_text sel="#net-out" text="ws open"
on_ws_msg
+ `ok`=True
+ `data`=""
msg = "ws ← " + data
> browser.set_text sel="#net-out" text=msg
on_ws_err
+ `ok`=False
+ `error`=""
msg = "ws error: " + error
> browser.set_text sel="#net-out" text=msg
on_ws_close
+ `ok`=True
> browser.set_text sel="#net-out" text="ws closed"
ws_send
+ `value`=""
w =
| op | id | data |
|---|---|---|
| send | ws_id |
value |
> browser.ws spec=w
ws_close
w =
| op | id |
|---|---|
| close | ws_id |
> browser.ws spec=w
copy_log
msg = > browser.set_text sel="#log" text="copied bag to clipboard"
c = > browser.clipboard text=bag
> browser.merge a=msg b=c
dl_list
msg = > browser.set_text sel="#log" text="download started"
d = > browser.download body=bag filename="items.txt"
> browser.merge a=msg b=d