Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
68c4f8c822 | ||
|
|
784d5ec346 | ||
|
|
955834e453 | ||
|
|
435f36b6e9 | ||
|
|
08c48f3acb | ||
|
|
ff1870cedc | ||
|
|
5e51ee1bb2 |
No files matched your search
@@ -113,9 +113,10 @@ jobs:
|
||||
## Marqdo ${{ github.ref_name }}
|
||||
|
||||
### 亮点 / Highlights
|
||||
- **宿主 H1–H4**:`app.proxy` 同域 SSE 中继 · `app.invoke` HTTP→`##` · MCP Server stdio · 跨模块 db
|
||||
- **Hosting H1–H4**: same-origin SSE proxy, HTTP→user `##`, MCP stdio server, cross-module db methods
|
||||
- Details: [CHANGELOG](https://github.com/cflmy/marqdo/blob/main/CHANGELOG.md) · [ext-hosting.md](https://github.com/cflmy/marqdo/blob/main/doc/roadmap/ext-hosting.md)
|
||||
- **中层标准库 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)
|
||||
|
||||
### Downloads
|
||||
|
||||
|
||||
@@ -8,6 +8,32 @@
|
||||
|
||||
### Changed
|
||||
|
||||
## v0.3.8 — 2026-09-09
|
||||
|
||||
### Highlights
|
||||
|
||||
**中层标准库 Mid2(M7–M10)收口**:日历/时区、URL、TOML、HTML 转义、base32、实用 fs、薄统计与日志字段——日常脚本与工具配置不再依赖外联或插件。另修复嵌套插件调用后 `GLOBAL_HOST` 被清空导致 `invoke` 失败。
|
||||
|
||||
```bash
|
||||
git checkout v0.3.8
|
||||
# 或下载 Release 的 exe / zip
|
||||
marqdo run public/features/14-datetime-url.mq.md
|
||||
marqdo run public/features/17-stats-log.mq.md
|
||||
```
|
||||
|
||||
### Added
|
||||
- **中层标准库 Mid2 M10**:`lib/stats` / `统计`(mean/median/stdev)与 `log`/`日志` 可选 `fields=`;金样与 public `17-stats-log`。**Mid2 M7–M10 收口**(zip 跳过)。设计 [stdlib-stats-log.md](doc/design/stdlib-stats-log.md)。
|
||||
- **中层标准库 Mid2 M9**:`fs.make_dirs` / `remove_tree` / `stat` / `walk`(中英);金样与 public `16-fs-mid2`。设计 [stdlib-fs-mid2.md](doc/design/stdlib-fs-mid2.md)。
|
||||
- **中层标准库 Mid2 M8**:`lib/toml` / `配置表`(只读子集)、`lib/html` / `超文本`(escape/unescape)、`encoding` base32;金样与 public `15-toml-html-encoding`。设计 [stdlib-toml.md](doc/design/stdlib-toml.md) · [stdlib-html.md](doc/design/stdlib-html.md)。
|
||||
- **中层标准库 Mid2 M7**:`lib/datetime` / `日期时间`(`{unix,zone,iso}` · parse/format/add/in_zone)与 `lib/url` / `地址`(parse · query_parse/stringify);金样与 public `14-datetime-url`。设计 [stdlib-datetime.md](doc/design/stdlib-datetime.md) · [stdlib-url.md](doc/design/stdlib-url.md)。
|
||||
- **文档**:中层标准库 Mid 之后缺口盘点与 Mid2(M7–M10)设计/路线——[stdlib-gaps-after-mid.md](doc/research/stdlib-gaps-after-mid.md) · [stdlib-mid2.md](doc/design/stdlib-mid2.md) · [stdlib-mid2.md](doc/roadmap/stdlib-mid2.md)。
|
||||
|
||||
### Fixed
|
||||
- **`host_query` / GLOBAL_HOST**:嵌套 `call_registered` 结束后恢复外层宿主指针,不再清空;`web_listen` 多轮 `invoke`(中间再调插件)不再报 `no active host context`。
|
||||
|
||||
### Changed
|
||||
|
||||
|
||||
## v0.3.7 — 2026-09-07
|
||||
|
||||
### Highlights
|
||||
|
||||
Generated
+2
-2
@@ -1079,7 +1079,7 @@ checksum = "112b39cec0b298b6c1999fee3e31427f74f676e4cb9879ed1a121b43661a4154"
|
||||
|
||||
[[package]]
|
||||
name = "marqdo"
|
||||
version = "0.3.7"
|
||||
version = "0.3.8"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"assert_cmd",
|
||||
@@ -1110,7 +1110,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "marqdo-wasm"
|
||||
version = "0.3.7"
|
||||
version = "0.3.8"
|
||||
dependencies = [
|
||||
"marqdo",
|
||||
"serde_json",
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "marqdo"
|
||||
version = "0.3.7"
|
||||
version = "0.3.8"
|
||||
edition = "2021"
|
||||
license = "Apache-2.0"
|
||||
description = "Marqdo — Markdown markers as an interpreted programming language"
|
||||
|
||||
@@ -99,7 +99,7 @@ marqdo catalog public -o .marqdo
|
||||
|
||||
---
|
||||
|
||||
## 现状(v0.3.7)
|
||||
## 现状(v0.3.8)
|
||||
|
||||
- 映射与解释器:Phase I 树遍历 + 字节码后端可用;金样例在 `tests/`
|
||||
- **对象**:`#` = 类型/构造,`##`+ = 函数/方法;见 [objects.md](doc/design/objects.md)
|
||||
@@ -107,7 +107,7 @@ marqdo catalog public -o .marqdo
|
||||
- **`marqdo debug`**:独立调试页(断点 / 单步 / locals;默认端口 7430;页面 favicon / 品牌使用官方 Logo)
|
||||
- **`marqdo catalog` / `sync`**:OKF 风格 YAML + 模块概念页
|
||||
- **`marqdo version --check`**:与 GitHub 最新 release 对比
|
||||
- 标准库:**内置于二进制**(v0.1.2+);磁盘 `lib/` 或 `MARQDO_LIB` 可覆盖。模块含文本、表、**浏览器效应**、文件、系统、时间、JSON、网络、数学、外联、插件、**自写回**、**子任务**;**中层 Mid M1–M6**(`re`/`encoding`/`path`/`hash`/`secrets`/`csv`/`cli`/`log`/`uuid` 及中英对称库,见 [stdlib-mid.md](doc/design/stdlib-mid.md))
|
||||
- 标准库:**内置于二进制**(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)
|
||||
- **`quantum`**:Q0–Q7 + Q8a/b 主题 SVG;示例 [quantum-entanglement](examples/quantum-entanglement/)
|
||||
@@ -121,12 +121,12 @@ marqdo catalog public -o .marqdo
|
||||
- **浏览器 Marqdo(WASM)**:`marqdo wasm build` + 官方 bridge 自启(作者零业务 JS;桥内可含列表/路由/storage/ws/文件/Canvas/音频/Observer/拖放);`lib/browser` + GFM;`web.client_embed`;示例 [browser-hello](examples/browser-hello/) · [browser-app](examples/browser-app/) · [browser-media](examples/browser-media/) · [web-client-site](examples/web-client-site/)([ADR 0002](doc/adr/0002-browser-marqdo-wasm.md) · [D](doc/roadmap/browser-wasm-d.md) · [E](doc/roadmap/browser-wasm-e.md) · [F](doc/roadmap/browser-wasm-f.md))
|
||||
- 选型:[ADR 0001 — Rust](doc/adr/0001-implementation-language.md) · [ADR 0002 — 浏览器 WASM](doc/adr/0002-browser-marqdo-wasm.md)(C0–C5 完结,见 [roadmap/browser-wasm.md](doc/roadmap/browser-wasm.md))· [ADR 0003 — 异步效应](doc/adr/0003-browser-async-effects.md)
|
||||
|
||||
### 如何使用最新 Marqdo(v0.3.7)
|
||||
### 如何使用最新 Marqdo(v0.3.8)
|
||||
|
||||
```bash
|
||||
# 1) 源码安装(跟 tag 或 main)
|
||||
git clone https://github.com/cflmy/marqdo.git && cd marqdo
|
||||
git checkout v0.3.7 # 或留在 main
|
||||
git checkout v0.3.8 # 或留在 main
|
||||
cargo build --release
|
||||
export PATH="$PWD/target/release:$PATH"
|
||||
marqdo version
|
||||
@@ -157,7 +157,7 @@ marqdo wasm build
|
||||
# → dist/wasm/ … 见 examples/browser-hello/
|
||||
|
||||
# 6) Windows:也可从 GitHub Releases 下载 exe / zip / vsix
|
||||
# https://github.com/cflmy/marqdo/releases/tag/v0.3.7
|
||||
# https://github.com/cflmy/marqdo/releases/tag/v0.3.8
|
||||
```
|
||||
|
||||
开发期也可用 `cargo run -- …` 代替已安装的 `marqdo`:
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "marqdo-wasm"
|
||||
version = "0.3.7"
|
||||
version = "0.3.8"
|
||||
edition = "2021"
|
||||
license = "Apache-2.0"
|
||||
description = "Marqdo interpreter as WebAssembly (browser host bridge)"
|
||||
|
||||
@@ -32,6 +32,17 @@
|
||||
| [design/stdlib.md](design/stdlib.md) | **标准库:内置 + `lib/` + 错误约定** |
|
||||
| [design/stdlib-i18n.md](design/stdlib-i18n.md) | **标准库中英命名:靠库文件名区分,无 lang 开关** |
|
||||
| [design/stdlib-modules.md](design/stdlib-modules.md) | **L1:文件/系统/时间/JSON/网络/数学/外联/插件** |
|
||||
| [design/stdlib-mid.md](design/stdlib-mid.md) | **中层 Mid M1–M6(已落地)** |
|
||||
| [design/stdlib-mid2.md](design/stdlib-mid2.md) | **中层 Mid2:datetime / url / toml / html / fs++** |
|
||||
| [design/stdlib-datetime.md](design/stdlib-datetime.md) | **`lib/datetime`(Mid2 M7)** |
|
||||
| [design/stdlib-url.md](design/stdlib-url.md) | **`lib/url`(Mid2 M7)** |
|
||||
| [design/stdlib-toml.md](design/stdlib-toml.md) | **`lib/toml`(Mid2 M8)** |
|
||||
| [design/stdlib-html.md](design/stdlib-html.md) | **`lib/html`(Mid2 M8)** |
|
||||
| [design/stdlib-fs-mid2.md](design/stdlib-fs-mid2.md) | **`lib/fs` Mid2 M9 加厚** |
|
||||
| [design/stdlib-stats-log.md](design/stdlib-stats-log.md) | **`lib/stats` + log.fields(Mid2 M10)** |
|
||||
| [research/stdlib-gaps-after-mid.md](research/stdlib-gaps-after-mid.md) | **Mid 之后缺口盘点**(对照 Python/Go) |
|
||||
| [roadmap/stdlib-mid.md](roadmap/stdlib-mid.md) | **Mid M1–M6 路线(done)** |
|
||||
| [roadmap/stdlib-mid2.md](roadmap/stdlib-mid2.md) | **Mid2 M7–M10 路线(规划)** |
|
||||
| [design/stdlib-math.md](design/stdlib-math.md) | **数学库(数值/随机/作图/轻量求解)** |
|
||||
| [design/stdlib-foreign.md](design/stdlib-foreign.md) | **外联胶水(\`\`\`lang 具名块)— 已落地** |
|
||||
| [design/ext-abi.md](design/ext-abi.md) | **原生插件 C ABI v1**(`lib/plugin`) |
|
||||
|
||||
@@ -0,0 +1,40 @@
|
||||
# 设计:`lib/datetime` / `lib/日期时间`(Mid2 M7)
|
||||
|
||||
| | |
|
||||
|---|---|
|
||||
| 状态 | **已落地** |
|
||||
| 日期 | 2026-09-09 |
|
||||
| 父设计 | [stdlib-mid2.md](stdlib-mid2.md) §2.1 |
|
||||
| 宿主 | `src/host/datetime.rs` · `host_datetime_*` |
|
||||
|
||||
---
|
||||
|
||||
## 1. 时刻形状
|
||||
|
||||
每次返回 **map**:
|
||||
|
||||
| 键 | 含义 |
|
||||
|----|------|
|
||||
| `unix` | 秒级 Unix 戳(int) |
|
||||
| `zone` | 固定偏移文本,如 `+08:00` / `+00:00` |
|
||||
| `iso` | RFC3339(秒精度) |
|
||||
|
||||
`to_unix` 也接受裸 int 或 ISO 文本。
|
||||
|
||||
## 2. API
|
||||
|
||||
| EN | ZH | 说明 |
|
||||
|----|-----|------|
|
||||
| `now` | `现在` | UTC 此刻(wasm 无时钟桥则失败) |
|
||||
| `from_unix` | `自戳` | `unix` + 可选 `zone` |
|
||||
| `to_unix` | `成戳` | |
|
||||
| `parse` | `解析` | 默认 RFC3339 / `YYYY-MM-DD[ HH:MM:SS]`;`pattern=` |
|
||||
| `format` | `格式化` | `rfc3339`/`date`/`time` 或 strftime |
|
||||
| `add` | `加` | `days`/`hours`/`minutes`/`seconds` |
|
||||
| `in_zone` | `时区` | 同瞬间换区 |
|
||||
|
||||
**区名**:`+HH:MM` / `UTC` / `Z`,以及少量固定偏移别名(如 `Asia/Shanghai`)。**不做**完整 tzdb / DST。
|
||||
|
||||
## 3. 与 `lib/time`
|
||||
|
||||
`lib/time` 保留极简 unix/format/parse/sleep。日历语义用本库。
|
||||
@@ -0,0 +1,25 @@
|
||||
# 设计:`lib/fs` Mid2 加厚(M9)
|
||||
|
||||
| | |
|
||||
|---|---|
|
||||
| 状态 | **已落地** |
|
||||
| 日期 | 2026-09-09 |
|
||||
| 父设计 | [stdlib-mid2.md](stdlib-mid2.md) §4 · [stdlib-fs-mid.md](stdlib-fs-mid.md)(M2) |
|
||||
| 宿主 | `src/host/fs.rs` · `host_make_dirs` / `host_remove_tree` / `host_stat` / `host_walk` |
|
||||
|
||||
---
|
||||
|
||||
## API
|
||||
|
||||
| EN | ZH | 行为 |
|
||||
|----|-----|------|
|
||||
| `make_dirs` | `建目录树` | 递归创建(与既有 `make_dir` 同为 `create_dir_all`;显式命名) |
|
||||
| `remove_tree` | `删目录树` | 仅删目录树;路径为文件则报错 |
|
||||
| `stat` | `状态` | `{size, mtime_unix, is_file, is_dir}` |
|
||||
| `walk` | `遍历` | **深度优先**;相对路径列表(正斜杠);含目录项;同级按名排序 |
|
||||
|
||||
既有 `remove` 对目录仍递归删除;`remove_tree` 拒绝文件,语义更窄。
|
||||
|
||||
## 刻意不做
|
||||
|
||||
ACL、watch、硬链接、`copy_tree`、惰性迭代器协议。
|
||||
@@ -0,0 +1,19 @@
|
||||
# 设计:`lib/html` / `lib/超文本`(Mid2 M8)
|
||||
|
||||
| | |
|
||||
|---|---|
|
||||
| 状态 | **已落地** |
|
||||
| 日期 | 2026-09-09 |
|
||||
| 父设计 | [stdlib-mid2.md](stdlib-mid2.md) §3.2 |
|
||||
| 宿主 | `src/host/html_ops.rs` · `host_html_escape` / `host_html_unescape` |
|
||||
|
||||
---
|
||||
|
||||
## API
|
||||
|
||||
| EN | ZH | 行为 |
|
||||
|----|-----|------|
|
||||
| `escape` | `转义` | `& < > " '` → 实体(`'` → `'`) |
|
||||
| `unescape` | `还原` | 上述实体(含 `'` / `'`) |
|
||||
|
||||
**不做** DOM / 模板引擎。
|
||||
@@ -4,7 +4,7 @@
|
||||
|---|---|
|
||||
| 状态 | **M1–M6 已落地** |
|
||||
| 日期 | 2026-09-07 |
|
||||
| 相关 | [stdlib.md](stdlib.md) · [stdlib-modules.md](stdlib-modules.md) · [ext-abi.md](ext-abi.md) · [roadmap/stdlib-mid.md](../roadmap/stdlib-mid.md) |
|
||||
| 相关 | [stdlib.md](stdlib.md) · [stdlib-modules.md](stdlib-modules.md) · [ext-abi.md](ext-abi.md) · [roadmap/stdlib-mid.md](../roadmap/stdlib-mid.md) · **后续** [stdlib-mid2.md](stdlib-mid2.md) · [stdlib-gaps-after-mid.md](../research/stdlib-gaps-after-mid.md) |
|
||||
| 目标 | 在接下来数个发版周期内,把「通用编程」能力沉到 **L0.5 宿主 + L1 `.mq.md`**,减少「凡是稍有能力就必须 ABI 插件」的路径依赖 |
|
||||
|
||||
---
|
||||
@@ -123,10 +123,12 @@ OS / 算法库(精选 crate,默认 features 最小化)
|
||||
| **M3** | `hash` / `哈希` · `secrets` / `机密` | sha256 / hmac;token | **done** |
|
||||
| **M4** | `csv` / `逗号表` · `text` 加厚 | parse / stringify;contains / replace | **done** |
|
||||
| **M5** | `table` 加厚 · `cli` / `命令行` | sort / zip;flags | **done** |
|
||||
| **M6** | `log` / `日志` · `uuid` / `标识` | level 日志;v4 | 薄 host 或纯 mq |
|
||||
| **可选** | `yaml` / `Toml` | 仅当 public/catalog 强需求 | 慎入 |
|
||||
| **M6** | `log` / `日志` · `uuid` / `标识` | level 日志;v4 | **done** |
|
||||
| **可选(Mid1)** | `yaml` | 默认 **不做** | 见 Mid2:优先 TOML |
|
||||
|
||||
**刻意延后:** 完整 `datetime` 时区库、连接池、异步 runtime、模板引擎、完整 `collections` 类型系统——等中层前几波用起来再议。
|
||||
**Mid1 刻意延后、现已升格到 Mid2:** 日历/时区、URL 解析 —— 见 [stdlib-mid2.md](stdlib-mid2.md) · [stdlib-gaps-after-mid.md](../research/stdlib-gaps-after-mid.md)。
|
||||
|
||||
**仍不准入 Mid:** 连接池、异步 runtime、模板引擎、完整 `collections` 类型系统、HTTP 服务端 / SQLite(`ext/`)。
|
||||
|
||||
---
|
||||
|
||||
|
||||
@@ -0,0 +1,139 @@
|
||||
# 设计:中层标准库第二波(Mid2 · M7–M10)
|
||||
|
||||
| | |
|
||||
|---|---|
|
||||
| 状态 | **Accepted · M7–M10 已落地(zip 跳过)** |
|
||||
| 日期 | 2026-09-09 |
|
||||
| 缺口盘点 | [stdlib-gaps-after-mid.md](../research/stdlib-gaps-after-mid.md) |
|
||||
| 路线图 | [stdlib-mid2.md](../roadmap/stdlib-mid2.md) |
|
||||
| 宪法 | [stdlib-mid.md](stdlib-mid.md) §3(准入 / 不准入 **不变**) |
|
||||
| 目标 | 在 M1–M6 之上补「日历 · URL · 配置 · HTML 安全 · fs 再厚」,仍保持宿主面积极小 |
|
||||
|
||||
---
|
||||
|
||||
## 0. 一句话
|
||||
|
||||
**Mid2 = 第二档通用原语,不是第二套 stdlib。** 仍落在 `lib/` + 薄 `host_*`;禁止借机引入 YAML 全家桶、HTTP 服务端、数据库。
|
||||
|
||||
---
|
||||
|
||||
## 1. 分层与禁止
|
||||
|
||||
| 允许 | 禁止 |
|
||||
|------|------|
|
||||
| 新 `lib/*.mq.md` 中英对偶 | 新开 `lib-mid2/` 目录树 |
|
||||
| 少数 `host_datetime_*` / `host_url_*` / `host_toml_parse` | 为 Mid 新增 ABI 插件 |
|
||||
| 加厚既有 `fs` / `encoding` / `net` / `text` | 把 `ext/web` 能力下沉进 `lib/net` 服务端 |
|
||||
| TOML **只读** | 完整 YAML 1.2、任意对象反序列化 |
|
||||
| HTML **转义** | 模板引擎 / CSS 选择器引擎 |
|
||||
|
||||
---
|
||||
|
||||
## 2. M7 — `datetime` + `url`
|
||||
|
||||
### 2.1 `lib/datetime.mq.md` / `lib/日期时间.mq.md`
|
||||
|
||||
| 函数(英) | 中文建议 | 行为 |
|
||||
|------------|----------|------|
|
||||
| `now` | `现在` | 返回结构化时刻(见下)或 ISO 文本(二选一,实现时锁定) |
|
||||
| `from_unix` / `to_unix` | `自戳` / `成戳` | 秒级;可选 `ms` |
|
||||
| `parse` | `解析` | 支持 RFC3339 / 常见 `YYYY-MM-DD[ HH:MM:SS]` |
|
||||
| `format` | `格式化` | strftime 子集或命名样式 `rfc3339`/`date`/`time` |
|
||||
| `add` | `加` | `days`/`hours`/`minutes`/`seconds` 具名 |
|
||||
| `in_zone` | `时区` | IANA 名或 `+08:00`;失败 → 诊断 |
|
||||
|
||||
**结构化时刻(建议 map)**:`{unix, zone, iso}` 或宿主不透明柄 + `_type=datetime`。优先 **map + 稳定字段**,便于 GFM/table 协作。
|
||||
|
||||
**刻意不做**:农历、营业日、完整 tzdb 热更新 UI、闰秒政治。
|
||||
|
||||
### 2.2 `lib/url.mq.md` / `lib/地址.mq.md`(或并入 `net`)
|
||||
|
||||
| 函数 | 行为 |
|
||||
|------|------|
|
||||
| `parse` | → `{scheme, userinfo, host, port, path, query, fragment}` |
|
||||
| `query_parse` | `a=1&b=2` → map(多值用列表) |
|
||||
| `query_stringify` | map → query |
|
||||
| `join` | base + relative(可选,可二期) |
|
||||
|
||||
既有 `net.url_encode` **保留**;文档写清:编码单段用 `net`/`encoding`,解析整 URL 用 `url`。
|
||||
|
||||
**验收**:金样解析带 query 的 HTTPS URL;往返 query。
|
||||
|
||||
---
|
||||
|
||||
## 3. M8 — `toml` + `html` + `encoding` 加厚
|
||||
|
||||
### 3.1 `lib/toml.mq.md` / `lib/Toml.mq.md`(或 `配置表`)
|
||||
|
||||
| 函数 | 行为 |
|
||||
|------|------|
|
||||
| `parse` | TOML 文本 → Marqdo map/list(只读) |
|
||||
|
||||
**不做** `stringify`(首版);需要写出时继续用 JSON。动机对齐 PEP 680:配置引导,而非通用文档格式战争。
|
||||
|
||||
### 3.2 HTML 转义
|
||||
|
||||
二选一(实现时定一):
|
||||
|
||||
- A:`lib/html.mq.md` · `escape` / `unescape`
|
||||
- B:`text.html_escape` / `text.html_unescape`
|
||||
|
||||
推荐 **A**(安全语义独立可见)。
|
||||
|
||||
### 3.3 `encoding` 加厚
|
||||
|
||||
| 函数 | 行为 |
|
||||
|------|------|
|
||||
| `base32_encode` / `base32_decode` | RFC 4648 |
|
||||
| (可选)`percent_decode` | 与 `url` 协作 |
|
||||
|
||||
---
|
||||
|
||||
## 4. M9 — `fs` 加厚
|
||||
|
||||
| 函数 | 行为 |
|
||||
|------|------|
|
||||
| `make_dirs` | 递归创建 |
|
||||
| `remove_tree` | 递归删除(目录) |
|
||||
| `stat` | `{size, mtime_unix, is_file, is_dir}` |
|
||||
| `walk` | 返回路径列表(深度优先或广度;文档锁定) |
|
||||
|
||||
**不做**:权限 ACL、watch/inotify、硬链接全家桶。
|
||||
|
||||
---
|
||||
|
||||
## 5. M10 — 收口糖(可选)
|
||||
|
||||
| 项 | 说明 |
|
||||
|----|------|
|
||||
| `lib/stats` 或 `math.mean`/`median`/`stdev` | 极薄;非 pandas |
|
||||
| `log` 结构化字段 | 可选 `fields=` map;非完整 slog 生态 |
|
||||
| `zip` 读写 | **默认跳过**;有明确 Release 需求再开 |
|
||||
|
||||
---
|
||||
|
||||
## 6. 宿主与 WASM
|
||||
|
||||
| Host | WASM |
|
||||
|------|------|
|
||||
| `datetime` / `url` / `toml` / `html` / `fs.stat` | 尽量可进;IANA tz 数据体积需评估(可 host-only + 文档标注) |
|
||||
| `fs.walk` / `remove_tree` | host-only 可接受 |
|
||||
|
||||
新 crate 写进 [dependencies.md](dependencies.md);禁止顺手拉大型框架。
|
||||
|
||||
---
|
||||
|
||||
## 7. 作者面风格
|
||||
|
||||
- 中英分文件;形参表声明全部可选并转发 `host_*`。
|
||||
- 数据优先 GFM / `table`;`json` 仍只 parse/stringify/quote。
|
||||
- 每波:设计短文 → host → lib → `tests/lib/*` → `public/features` 短页。
|
||||
|
||||
---
|
||||
|
||||
## 8. 完成定义(Mid2 整包)
|
||||
|
||||
1. 作者可用 `datetime` + `url` + `toml.parse` + `html.escape` 写配置驱动脚本,无需 foreign。
|
||||
2. `fs.stat` / `make_dirs` 金样绿。
|
||||
3. 研究文高优先级缺口标 closed;YAML/模板/sqlite 仍标明 won't。
|
||||
4. [stdlib-modules.md](stdlib-modules.md) 总表更新;`stdlib.md` 状态改为 Mid2 进行中/完成。
|
||||
@@ -2,10 +2,10 @@
|
||||
|
||||
| | |
|
||||
|---|---|
|
||||
| 状态 | **核心已落地**;**中层 Mid:M1–M6 已落地** · [stdlib-mid.md](stdlib-mid.md) / [roadmap/stdlib-mid.md](../roadmap/stdlib-mid.md) |
|
||||
| 日期 | 2026-09-07 |
|
||||
| 状态 | **核心已落地**;**Mid M1–M6 已落地**;**Mid2 规划中** · [stdlib-mid2.md](stdlib-mid2.md) / [roadmap/stdlib-mid2.md](../roadmap/stdlib-mid2.md) |
|
||||
| 日期 | 2026-09-08 |
|
||||
| 原则 | 全部经 frontmatter **导入**;除 JSON 外中英分文件;内核保持少而精;**通用能力优先 Mid,插件留给领域核** |
|
||||
| 相关 | [stdlib.md](stdlib.md) · [stdlib-i18n.md](stdlib-i18n.md) · [stdlib-mid.md](stdlib-mid.md) · [ext-abi.md](ext-abi.md) · [ext-llm.md](ext-llm.md) · [ext-agent.md](ext-agent.md) · [**module-namespace.md**](module-namespace.md)(导入命名空间;**M1/M2 已落地**:`库.成员` / `库.对象.成员` / `use`) |
|
||||
| 相关 | [stdlib.md](stdlib.md) · [stdlib-i18n.md](stdlib-i18n.md) · [stdlib-mid.md](stdlib-mid.md) · [stdlib-mid2.md](stdlib-mid2.md) · [stdlib-gaps-after-mid.md](../research/stdlib-gaps-after-mid.md) · [ext-abi.md](ext-abi.md) · [ext-llm.md](ext-llm.md) · [ext-agent.md](ext-agent.md) · [**module-namespace.md**](module-namespace.md)(导入命名空间;**M1/M2 已落地**:`库.成员` / `库.对象.成员` / `use`) |
|
||||
|
||||
---
|
||||
|
||||
@@ -17,17 +17,22 @@
|
||||
|--------|--------|--------|------|
|
||||
| 文本 | `lib/text.mq.md` | `lib/文本.mq.md` | 已有 + **Mid M4** 加厚 |
|
||||
| **正则** | `lib/re.mq.md` | `lib/正则.mq.md` | **Mid M1** |
|
||||
| **编解码** | `lib/encoding.mq.md` | `lib/编码.mq.md` | **Mid M1** |
|
||||
| **编解码** | `lib/encoding.mq.md` | `lib/编码.mq.md` | **Mid M1** + Mid2 M8 base32 |
|
||||
| **路径** | `lib/path.mq.md` | `lib/路径.mq.md` | **Mid M2** |
|
||||
| **哈希** | `lib/hash.mq.md` | `lib/哈希.mq.md` | **Mid M3** |
|
||||
| **机密** | `lib/secrets.mq.md` | `lib/机密.mq.md` | **Mid M3** |
|
||||
| **逗号表** | `lib/csv.mq.md` | `lib/逗号表.mq.md` | **Mid M4** |
|
||||
| 表 | `lib/table.mq.md` | `lib/表.mq.md` | 已有 + Mid M4/M5:`sort`/`unique`/`zip`/… |
|
||||
| **命令行** | `lib/cli.mq.md` | `lib/命令行.mq.md` | **Mid M5** |
|
||||
| **日志** | `lib/log.mq.md` | `lib/日志.mq.md` | **Mid M6** |
|
||||
| **日志** | `lib/log.mq.md` | `lib/日志.mq.md` | **Mid M6** + Mid2 M10 `fields=` |
|
||||
| **标识** | `lib/uuid.mq.md` | `lib/标识.mq.md` | **Mid M6** |
|
||||
| **日期时间** | `lib/datetime.mq.md` | `lib/日期时间.mq.md` | **Mid2 M7** |
|
||||
| **地址** | `lib/url.mq.md` | `lib/地址.mq.md` | **Mid2 M7** |
|
||||
| **配置表** | `lib/toml.mq.md` | `lib/配置表.mq.md` | **Mid2 M8** |
|
||||
| **超文本** | `lib/html.mq.md` | `lib/超文本.mq.md` | **Mid2 M8** |
|
||||
| **统计** | `lib/stats.mq.md` | `lib/统计.mq.md` | **Mid2 M10** |
|
||||
| 浏览器效应 | `lib/browser.mq.md` | `lib/浏览器.mq.md` | WASM 客户端效应助手(GFM + helpers;勿用 `json.set` 链) |
|
||||
| 文件 | `lib/fs.mq.md` | `lib/文件.mq.md` | 已有 + Mid M2:`copy_file` / `move` / `make_temp` |
|
||||
| 文件 | `lib/fs.mq.md` | `lib/文件.mq.md` | 已有 + Mid M2 + **Mid2 M9**:`make_dirs` / `remove_tree` / `stat` / `walk` |
|
||||
| 系统 | `lib/sys.mq.md` | `lib/系统.mq.md` | 已有(含 `load_dotenv`) |
|
||||
| 时间 | `lib/time.mq.md` | `lib/时间.mq.md` | 已有 |
|
||||
| JSON | `lib/json.mq.md` | **同文件** | **仅** parse / stringify / quote;集合请用 table / GFM |
|
||||
@@ -42,6 +47,8 @@
|
||||
|
||||
**中层已落地:** M1–M6(含 log / uuid)— 见 [stdlib-mid.md](stdlib-mid.md) · [stdlib-log-uuid.md](stdlib-log-uuid.md)。
|
||||
|
||||
**Mid2:** **M7–M10 done**(datetime / url / toml / html / base32 / fs++ / stats / log.fields;zip 跳过)— [stdlib-mid2.md](stdlib-mid2.md) · [stdlib-stats-log.md](stdlib-stats-log.md)。
|
||||
|
||||
设计细节:[stdlib-writeback.md](stdlib-writeback.md) · [stdlib-subtask.md](stdlib-subtask.md)。
|
||||
|
||||
---
|
||||
|
||||
@@ -0,0 +1,30 @@
|
||||
# 设计:`lib/stats` / `lib/统计` 与 `log.fields`(Mid2 M10)
|
||||
|
||||
| | |
|
||||
|---|---|
|
||||
| 状态 | **已落地** |
|
||||
| 日期 | 2026-09-09 |
|
||||
| 父设计 | [stdlib-mid2.md](stdlib-mid2.md) §5 |
|
||||
| 宿主 | `src/host/stats.rs` · `host_stats_*`;`log::line` 可选 `fields` |
|
||||
|
||||
---
|
||||
|
||||
## 1. `lib/stats`
|
||||
|
||||
| EN | ZH | 行为 |
|
||||
|----|-----|------|
|
||||
| `mean` | `均值` | 算术平均 → Num |
|
||||
| `median` | `中位数` | 排序后中位;偶数取两中点平均 |
|
||||
| `stdev` | `标准差` | **样本**标准差(n≥2) |
|
||||
|
||||
**不做** dataframe、分位数全家桶、加权统计。
|
||||
|
||||
## 2. `log` `fields=`
|
||||
|
||||
各级别函数可选 `fields`(map)。宿主拼到行尾:`INFO msg key=val …`(map 插入序)。
|
||||
|
||||
**不做** 远程 sink、结构化 JSON 日志协议。
|
||||
|
||||
## 3. zip
|
||||
|
||||
按路线图 **默认跳过**。
|
||||
@@ -0,0 +1,24 @@
|
||||
# 设计:`lib/toml` / `lib/配置表`(Mid2 M8)
|
||||
|
||||
| | |
|
||||
|---|---|
|
||||
| 状态 | **已落地** |
|
||||
| 日期 | 2026-09-09 |
|
||||
| 父设计 | [stdlib-mid2.md](stdlib-mid2.md) §3.1 |
|
||||
| 宿主 | `src/host/toml_ops.rs` · `host_toml_parse`(手写子集,无 `toml` crate) |
|
||||
|
||||
---
|
||||
|
||||
## 1. API
|
||||
|
||||
| EN | ZH | 行为 |
|
||||
|----|-----|------|
|
||||
| `parse` | `解析` | TOML 文本 → map/list |
|
||||
|
||||
**不做** `stringify`;写出继续用 JSON。
|
||||
|
||||
## 2. 子集
|
||||
|
||||
支持:`#` 注释、基本/字面字符串、int/float/bool、标量数组、`[table]` 与 dotted key。
|
||||
|
||||
**不支持:** `[[array of tables]]`、内联表、TOML datetime、多行字符串。
|
||||
@@ -0,0 +1,24 @@
|
||||
# 设计:`lib/url` / `lib/地址`(Mid2 M7)
|
||||
|
||||
| | |
|
||||
|---|---|
|
||||
| 状态 | **已落地** |
|
||||
| 日期 | 2026-09-09 |
|
||||
| 父设计 | [stdlib-mid2.md](stdlib-mid2.md) §2.2 |
|
||||
| 宿主 | `src/host/url_ops.rs` · `host_url_*`(手写子集,无 `url` crate) |
|
||||
|
||||
---
|
||||
|
||||
## 1. 与 `net.url_encode`
|
||||
|
||||
| API | 用途 |
|
||||
|-----|------|
|
||||
| `net.url_encode` | **单段** form 编码(空格→`+`) |
|
||||
| `url.parse` | 整 URL → `{scheme,userinfo,host,port,path,query,fragment}` |
|
||||
| `url.query_parse` / `query_stringify` | 查询串 ↔ map(重复键→列表;空格→`%20`) |
|
||||
|
||||
## 2. 解析子集
|
||||
|
||||
`scheme://[userinfo@]host[:port]/path[?query][#fragment]`,含 IPv6 `[addr]`。缺 path 时规范为 `/`。
|
||||
|
||||
**不做**:相对 URL join、完整 WHATWG 边角、IDNA 规范化(host 原样保留)。
|
||||
@@ -2,13 +2,14 @@
|
||||
|
||||
| | |
|
||||
|---|---|
|
||||
| 状态 | **S0–S3 + 核心 L1 已落地 · 中层 L1(Mid)规划中** |
|
||||
| 日期 | 2026-09-07 |
|
||||
| 相关 | [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) · [module-namespace.md](module-namespace.md) · [ext-abi.md](ext-abi.md) |
|
||||
| 状态 | **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) |
|
||||
|
||||
> **多语言库命名**:见 [stdlib-i18n.md](stdlib-i18n.md)(不设 `lang:`;中英分文件)。
|
||||
> **L1 模块清单**(含 math/foreign/plugin):见 [stdlib-modules.md](stdlib-modules.md)。
|
||||
> **中层标准库(数个版本)**:通用原语沉 `lib/`、减少「事事插件」——设计 [stdlib-mid.md](stdlib-mid.md) · 路线 [roadmap/stdlib-mid.md](../roadmap/stdlib-mid.md)。
|
||||
> **中层标准库 Mid(M1–M6)**:已落地——[stdlib-mid.md](stdlib-mid.md) · [roadmap/stdlib-mid.md](../roadmap/stdlib-mid.md)。
|
||||
> **中层第二波 Mid2(M7–M10)**:已落地——[stdlib-mid2.md](stdlib-mid2.md) · [roadmap/stdlib-mid2.md](../roadmap/stdlib-mid2.md) · 缺口 [stdlib-gaps-after-mid.md](../research/stdlib-gaps-after-mid.md)。
|
||||
> **`ext/` 不是 stdlib**:官方可选扩展见 [ext-llm.md](ext-llm.md) / [ext-agent.md](ext-agent.md)。
|
||||
|
||||
---
|
||||
@@ -19,7 +20,8 @@
|
||||
|----|------|
|
||||
| **L0 内置** | 解释器内:`print` `input` `len` `str` `int` `type` `trim` `split` `join` `at`(`type` 可含 `map`) |
|
||||
| **L1 核心** | 已有 [`lib/`](../../lib/):fs/sys/time/json/net/math/foreign/plugin/table/text/… |
|
||||
| **L1 中层(Mid)** | 规划中:re / encoding / path / hash / csv / … — 仍在 `lib/`,见 [stdlib-mid.md](stdlib-mid.md) |
|
||||
| **L1 中层(Mid)** | **已落地** re / encoding / path / hash / secrets / csv / text++ / table++ / cli / log / uuid — [stdlib-mid.md](stdlib-mid.md) |
|
||||
| **L1 Mid2** | **已落地** datetime / url / toml / html / fs++ / stats / log.fields — [stdlib-mid2.md](stdlib-mid2.md) |
|
||||
| **官方 ext** | [`ext/`](../../ext/)(`.mq.md` + 可选原生插件);`MARQDO_EXT`;**不属于** L1;插件仅领域热路径 |
|
||||
| **L2** | catalog / 用户站收录(随发版);应主要靠核心+中层、默认无插件 |
|
||||
|
||||
|
||||
@@ -0,0 +1,144 @@
|
||||
# 调研:Mid M1–M6 之后标准库还缺什么
|
||||
|
||||
| | |
|
||||
|---|---|
|
||||
| 状态 | **调研笔记 · 缺口盘点(M1–M6 闭环之后)** |
|
||||
| 日期 | 2026-09-08 |
|
||||
| 基线 | **v0.3.7+** · Mid M1–M6 **done** |
|
||||
| 已落地设计 | [stdlib-mid.md](../design/stdlib-mid.md) · [stdlib-modules.md](../design/stdlib-modules.md) · [roadmap/stdlib-mid.md](../roadmap/stdlib-mid.md) |
|
||||
| 补齐设计 | [stdlib-mid2.md](../design/stdlib-mid2.md) |
|
||||
| 实现路线 | [stdlib-mid2.md](../roadmap/stdlib-mid2.md) |
|
||||
| 外部对照 | Python stdlib([use-case 索引](https://www.socratopia.app/library/python-programming-ai-era-en/chapter-15) · [PEP 680 tomllib](https://peps.python.org/pep-0680/))· Go `strings`/`regexp`/`encoding/*`/`crypto`/`path`/`time`/`net/url` · Node 内置 vs userland |
|
||||
|
||||
---
|
||||
|
||||
## 0. 一句话结论
|
||||
|
||||
**M1–M6 已把「写日常脚本 / 多数扩展库不再事事插件」的硬缺口补齐。** 相对 Python / Go 的「通用原语层」,Marqdo **不再缺** 正则、编解码、路径、哈希、CSV、集合糖、CLI、日志、UUID。
|
||||
|
||||
仍缺的是 **第二档通用能力**:日历与时区、URL/查询串、配置格式(优先 TOML)、HTML 安全转义、文件系统再厚一点(`mkdir -p` / 元数据 / 递归删除)、轻量统计。这些**值得开 Mid2(M7+)**,但**不应**再开一轮「事事插件」;也**不要**把 YAML 全家桶、HTTP 服务端、SQLite、图像/ML 塞进 `lib/`。
|
||||
|
||||
---
|
||||
|
||||
## 1. 已有基线(不是缺口)
|
||||
|
||||
| 族 | Marqdo | 对标 |
|
||||
|----|--------|------|
|
||||
| 文本 / 正则 | `text`++ · `re` | Python `str`/`re` · Go `strings`/`regexp` |
|
||||
| 编解码 | `encoding`(base64/hex)· `net.url_encode` | Go `encoding/base64`/`hex` · Python `base64`/`binascii` |
|
||||
| 路径 / 文件 | `path` · `fs`(含 copy/move/temp) | Go `path/filepath` · Python `pathlib`(子集) |
|
||||
| 完整性 / 机密 | `hash` · `secrets` | Go `crypto` 子集 · Python `hashlib`/`secrets` |
|
||||
| 表数据 | `csv` · `table`++ · `json` | Go `encoding/csv`/`json` · Python `csv`/`json` |
|
||||
| CLI / 可观测 | `cli` · `log` · `uuid` | Python `argparse`/`logging`/`uuid`(窄) |
|
||||
| 时间(极简) | `time`:unix/ms · format · parse · sleep | **远薄于** Python `datetime`/`zoneinfo` · Go `time` |
|
||||
| 网络客户端 | `net`:HTTP/SSE/cookie/multipart/markdown | Go `net/http` **客户端**侧;服务端在 `ext/web` |
|
||||
| 数学 | `math`(含公式/作图) | Python `math` + 教学向扩展 |
|
||||
|
||||
准入宪法仍见 [stdlib-mid.md](../design/stdlib-mid.md) §3:跨领域、难写对、解锁无插件写库、宿主面积极小。
|
||||
|
||||
---
|
||||
|
||||
## 2. 对照总表(按「脚本作者是否还要 foreign / 自造轮子」)
|
||||
|
||||
| 能力 | Python / Go 常态 | Marqdo 现状 | 缺口级别 | Mid2 建议 |
|
||||
|------|------------------|-------------|----------|-----------|
|
||||
| 日历日期 / 时区 / timedelta | `datetime`+`zoneinfo` · `time` | 仅 unix 戳 + 简单 format/parse | **高** | **M7** `datetime` |
|
||||
| URL 解析 / 查询串 | `urllib.parse` · `net/url` | 仅 `url_encode` | **高** | **M7** `url`(或并入 `net`) |
|
||||
| 配置 TOML 只读 | `tomllib`(PEP 680) | 无 | **中高** | **M8** `toml`(只读优先) |
|
||||
| 配置 YAML | 第三方;**故意不进** CPython | 无 | **低 / 慎入** | 默认 **不做**;与 Python 同理(复杂度/安全) |
|
||||
| HTML / XML 转义 | `html` · `html/template` 转义 | 无(`markdown_parse` ≠ 转义) | **中** | **M8** `html` 或 `text.html_escape` |
|
||||
| `mkdir -p` / 递归删 / stat | `pathlib`/`shutil` | `make_dir`/`remove` 偏浅 | **中** | **M9** `fs` 加厚 |
|
||||
| 文件元数据(size/mtime) | `os.stat` · `Path.stat` | 无一等 API | **中** | **M9** |
|
||||
| base32 / percent 完整 | `base64.b32*` · `url` | 无 base32 | **低–中** | **M8** `encoding` 加厚 |
|
||||
| 轻量统计 | `statistics` | `math` 无 mean/median | **低–中** | **M10** `stats` 或 `math` 薄加 |
|
||||
| 计数 / 默认字典 / deque | `collections` | `table` 可凑 | **低** | 优先用 `table`;必要时 M10 `collections` 极薄 |
|
||||
| 组合迭代 | `itertools` | 无 | **低** | 多数可用 `table`;**延后** |
|
||||
| 模板引擎 | Jinja / Go `text/template` | 无 | **不准入 Mid** | 应用层 / 未来 ext |
|
||||
| SQLite 客户端 | `sqlite3` · `database/sql` | **`ext/web` `# db`** | **不准入** | 保持扩展 |
|
||||
| HTTP 服务端 | — | **`ext/web`** | **不准入** | 已关闭(宿主波次另文) |
|
||||
| 密码哈希 Argon2 | 第三方 / 框架 | `ext/web` 已有 | **不准入 Mid** | 安全产品面 |
|
||||
| 完整 TLS/证书 API | `ssl` · `crypto/tls` | 客户端 HTTPS 由 ureq | **不准入** | 宿主实现细节即可 |
|
||||
| 压缩 zip/tar | `zipfile` · `archive/zip` | 无 | **低** | 可选 M10;体积敏感 |
|
||||
| 环境 `.env` | 第三方;Go 常自写 | **`sys.load_dotenv` 已有** | 无 | — |
|
||||
|
||||
---
|
||||
|
||||
## 3. 分项说明(高优先级)
|
||||
|
||||
### 3.1 日历 / 时区(M7 候选之首)
|
||||
|
||||
**问题**
|
||||
脚本与站点大量需要「今天」「本地日界」「RFC3339」「时区换算」。现有 `time.parse`/`format` 够演示,不够「难写对」的日历语义(闰秒除外,但 DST / offset 已够劝退字符串拼接)。
|
||||
|
||||
**对照**
|
||||
Python 强调 **aware datetime + zoneinfo**;Go `time.Location` 是日常依赖。Mid 原文已把「完整 datetime 时区库」标为刻意延后——M1–M6 完成后应升格。
|
||||
|
||||
**建议窄 API(设计文锁定)**
|
||||
`now` / `parse` / `format` / `add`(天/时)/ `to_unix` / `from_unix` / 可选 `in_zone`(IANA 或固定 offset)。**不做**完整历法 UI、农历、业务假期库。
|
||||
|
||||
### 3.2 URL 与查询串
|
||||
|
||||
**问题**
|
||||
`url_encode` 只解决「编码一段」;解析 `https://a/b?x=1&y=2#frag`、合并 query、取 path 仍靠 `re` 自造。浏览器代理 / `invoke` / webhook 场景高频。
|
||||
|
||||
**建议**
|
||||
`url.parse` → `{scheme,host,path,query,fragment}`;`url.query_parse` / `query_stringify`;与 `url_encode` 边界写进 `net` vs 新 `lib/url`。
|
||||
|
||||
### 3.3 TOML vs YAML
|
||||
|
||||
**外部事实**
|
||||
Python 因 **打包引导**(`pyproject.toml`)接受只读 `tomllib`([PEP 680](https://peps.python.org/pep-0680/));YAML 多次被拒:规范复杂、实现难维护、安全面大。
|
||||
|
||||
**对 Marqdo**
|
||||
catalog / 工具配置若走向 TOML,只读 `toml.parse` 性价比高。YAML:**默认不准入 Mid**;若 public 强需求,单独 ADR,且优先「JSON 超集子集」而非完整 1.2。
|
||||
|
||||
### 3.4 HTML 转义
|
||||
|
||||
**问题**
|
||||
`ext/web` 与浏览器 WASM 拼 HTML 时,缺 `escape` 易 XSS。这是「难写对 / 安全相关」的经典 stdlib 项(Python `html.escape`)。
|
||||
|
||||
**建议**
|
||||
极薄:`html.escape` / `unescape`(或挂 `text`)。**不做** DOM / 模板语言。
|
||||
|
||||
### 3.5 文件系统再厚
|
||||
|
||||
**问题**
|
||||
`make_dir` 是否递归、`remove` 是否递归、无 `stat`(size/mtime)、无 `walk`——脚本仍会 `foreign` 或脆弱字符串。
|
||||
|
||||
**建议**
|
||||
`fs.make_dirs` · `fs.remove_tree` · `fs.stat` · 可选 `fs.walk`(返回路径列表,非惰性迭代器协议)。
|
||||
|
||||
---
|
||||
|
||||
## 4. 明确「不是缺口」
|
||||
|
||||
| 项 | 说明 |
|
||||
|----|------|
|
||||
| Mid M1–M6 清单本身 | 已收口;不要用本表重开 base64/re |
|
||||
| HTTP 服务 / DB / Agent | `ext/*`;见 [ext-hosting](ext-hosting-gaps.md) |
|
||||
| Dense embedding / 向量库默认化 | OKF 路线不变 |
|
||||
| 完整 `collections` / `itertools` 类型系统 | 语言没有泛型迭代协议;用 `table` |
|
||||
| 「对齐 Python 模块个数」 | 反模式;对齐**用例与难写对** |
|
||||
|
||||
---
|
||||
|
||||
## 5. 优先级建议(转入 Mid2)
|
||||
|
||||
| 优先级 | 波次草案 | 内容 |
|
||||
|--------|----------|------|
|
||||
| **高** | **M7** | `datetime` + `url` — **done** |
|
||||
| **高** | **M8** | `toml` 只读 + `html.escape` + `encoding` base32 — **done** |
|
||||
| **中** | **M9** | `fs` 加厚(dirs/stat/walk) — **done** |
|
||||
| **低** | **M10** | `stats` 薄 · log 字段 · (zip 默认跳过) — **done**(zip 仍跳过) |
|
||||
| **won't** | — | 完整 YAML · 模板引擎 · sqlite 进 `lib/` |
|
||||
|
||||
---
|
||||
|
||||
## 6. 与其它文档
|
||||
|
||||
| 文档 | 关系 |
|
||||
|------|------|
|
||||
| [stdlib-mid2.md](../design/stdlib-mid2.md) | **补齐设计(作者 API + 边界)** |
|
||||
| [stdlib-mid2.md](../roadmap/stdlib-mid2.md) | 实现波次 M7–M10 |
|
||||
| [stdlib-mid.md](../design/stdlib-mid.md) | Mid1 宪法;本调研不改准入原则 |
|
||||
| [web-net-capabilities.md](../design/web-net-capabilities.md) | 网络服务端能力在 ext,不进 Mid2 |
|
||||
@@ -18,7 +18,7 @@
|
||||
| **诊断** | 语句级 `path:line:col: message`;字节码指令带 `spans`;errors 金样例双后端断言位置 | **P0 完成** |
|
||||
| **view** | 结构 + 执行 + 源码 + 函数大纲/搜索;无断点 | 文档浏览器 |
|
||||
| **debug** | 独立 `marqdo debug`:断点 / 单步 / locals(树遍历) | **P3-D3 v1** |
|
||||
| **标准库** | 核心 L1 已完成([stdlib-modules.md](../design/stdlib-modules.md));下一主线 = **中层 Mid**([stdlib-mid.md](../design/stdlib-mid.md) · [stdlib-mid 路线](stdlib-mid.md)) | **P2 完成;Mid M1–M6 规划中** |
|
||||
| **标准库** | 核心 L1 + Mid M1–M6 + Mid2 M7–M10 已完成([stdlib-modules.md](../design/stdlib-modules.md) · [stdlib-mid2.md](../design/stdlib-mid2.md)) | **P2 + Mid1 + Mid2 完成** |
|
||||
| **模块** | [module-namespace.md](../design/module-namespace.md):**M1+M2 已落地**(库名绑定、`库.成员` / `use`;无扁平合并) | — |
|
||||
|
||||
用户点名的三件事都对,但**不能并行硬开**:断点调试依赖「可信位置 + 可暂停执行」;标准库依赖稳定运行时与 I/O;`input` 在 CLI 与 view 是两条路径。
|
||||
|
||||
@@ -2,9 +2,10 @@
|
||||
|
||||
| | |
|
||||
|---|---|
|
||||
| 状态 | **M1–M6 已落地** |
|
||||
| 状态 | **M1–M6 已落地**(收口) |
|
||||
| 日期 | 2026-09-07 |
|
||||
| 设计 | [stdlib-mid.md](../design/stdlib-mid.md) |
|
||||
| 后续 | [stdlib-mid2.md](stdlib-mid2.md) · [stdlib-gaps-after-mid.md](../research/stdlib-gaps-after-mid.md) |
|
||||
| 相关 | [stdlib-modules.md](../design/stdlib-modules.md) · [next-phase.md](next-phase.md) · [ext-cli.md](../design/ext-cli.md) |
|
||||
|
||||
> **不预标 SemVer。** 每一波随当时产品发版合入;下文用 **M1…M6** 波次名。每波须可单独演示、可回滚。
|
||||
|
||||
@@ -0,0 +1,91 @@
|
||||
# 路线图:中层标准库第二波(M7–M10)
|
||||
|
||||
| | |
|
||||
|---|---|
|
||||
| 状态 | **Completed · M7–M10 已落地(zip 跳过)** |
|
||||
| 日期 | 2026-09-09 |
|
||||
| 设计 | [stdlib-mid2.md](../design/stdlib-mid2.md) |
|
||||
| 缺口 | [stdlib-gaps-after-mid.md](../research/stdlib-gaps-after-mid.md) |
|
||||
| 前序 | [stdlib-mid.md](stdlib-mid.md)(**M1–M6 done**) |
|
||||
| 基线 | v0.3.7+ |
|
||||
|
||||
> **不预标 SemVer。** 波次名 **M7…M10**;每波可单独演示、可回滚。
|
||||
|
||||
---
|
||||
|
||||
## 0. 总序
|
||||
|
||||
```text
|
||||
M7 时间与地址 datetime + url
|
||||
M8 配置与安全字面 toml(只读) + html.escape + encoding/base32
|
||||
M9 文件再厚 fs make_dirs / remove_tree / stat / walk
|
||||
M10 收口糖(可选) stats 薄 · log 字段 · (zip 默认跳过)
|
||||
```
|
||||
|
||||
原则:
|
||||
|
||||
1. 继承 Mid1 宪法:通用、难写对、小宿主、可冻 API。
|
||||
2. **TOML 优先于 YAML**(对齐 PEP 680 教训)。
|
||||
3. 不阻塞宿主 / ext 产品线;但新「通用」ABI 插件默认拒绝。
|
||||
|
||||
---
|
||||
|
||||
## 1. 波次明细
|
||||
|
||||
### M7 — datetime + url — **done**
|
||||
|
||||
| 交付 | 说明 |
|
||||
|------|------|
|
||||
| `lib/datetime` · `日期时间` | now/parse/format/add/unix/zone 子集 |
|
||||
| `lib/url` · `地址` | parse · query_parse/stringify(手写;无 `url` crate) |
|
||||
| Host | `host_datetime_*` · `host_url_*` |
|
||||
| 金样 | `tests/lib/datetime-smoke` · `url-smoke`(中英) |
|
||||
| public | `14-datetime-url` · `14-日期时间地址` |
|
||||
| 设计 | [stdlib-datetime.md](../design/stdlib-datetime.md) · [stdlib-url.md](../design/stdlib-url.md) |
|
||||
|
||||
### M8 — toml + html + encoding — **done**
|
||||
|
||||
| 交付 | 说明 |
|
||||
|------|------|
|
||||
| `lib/toml` · `配置表` | 只读子集 `parse` |
|
||||
| `lib/html` · `超文本` | `escape` / `unescape` |
|
||||
| `encoding` base32 | RFC 4648 |
|
||||
| 金样 | `toml-html-encoding-smoke`(中英) |
|
||||
| public | `15-toml-html-encoding` · `15-配置表超文本编码` |
|
||||
| 设计 | [stdlib-toml.md](../design/stdlib-toml.md) · [stdlib-html.md](../design/stdlib-html.md) |
|
||||
|
||||
### M9 — fs 加厚 — **done**
|
||||
|
||||
| 交付 | 说明 |
|
||||
|------|------|
|
||||
| `make_dirs` / `remove_tree` / `stat` / `walk` | 见 [stdlib-fs-mid2.md](../design/stdlib-fs-mid2.md) |
|
||||
| 金样 | `fs-mid2-smoke`(中英) |
|
||||
| public | `16-fs-mid2` · `16-文件mid2` |
|
||||
|
||||
### M10 — 可选收口 — **done**(zip 跳过)
|
||||
|
||||
| 交付 | 说明 |
|
||||
|------|------|
|
||||
| `lib/stats` · `统计` | mean / median / sample stdev |
|
||||
| `log` `fields=` | 行尾 `key=val` |
|
||||
| zip | **跳过** |
|
||||
| 金样 | `stats-log-smoke`(中英) |
|
||||
| public | `17-stats-log` · `17-统计日志` |
|
||||
| 设计 | [stdlib-stats-log.md](../design/stdlib-stats-log.md) |
|
||||
|
||||
---
|
||||
|
||||
## 2. 进度勾选
|
||||
|
||||
- [x] M7 datetime + url
|
||||
- [x] M8 toml + html + base32
|
||||
- [x] M9 fs 加厚
|
||||
- [x] M10 可选(zip 跳过)
|
||||
- [x] 研究文高优先级缺口 → closed(M7–M9;M10 为收口糖)
|
||||
- [x] `stdlib-modules.md` / `stdlib.md` 状态同步
|
||||
|
||||
---
|
||||
|
||||
## 3. 成功标准
|
||||
|
||||
对外可宣称:在 Mid1(文本/路径/哈希/CSV/CLI/日志)之上,**日历、URL、TOML 配置、HTML 转义、实用 fs** 无需外联即可完成常见脚本与 catalog 工具——领域能力仍在 `ext/`。
|
||||
@@ -0,0 +1,54 @@
|
||||
---
|
||||
title: lib/datetime
|
||||
description: Calendar moments as maps {unix, zone, iso} (Mid2 M7). Fixed offsets + a few IANA aliases.
|
||||
---
|
||||
|
||||
## now
|
||||
|
||||
Current UTC moment map.
|
||||
|
||||
**> host_datetime_now**
|
||||
|
||||
## from_unix
|
||||
+ `unix`
|
||||
+ `zone`=None
|
||||
|
||||
**> host_datetime_from_unix unix=`unix` zone=`zone`**
|
||||
|
||||
## to_unix
|
||||
+ `dt`
|
||||
|
||||
**> host_datetime_to_unix dt=`dt`**
|
||||
|
||||
## parse
|
||||
+ `text`
|
||||
+ `pattern`=None
|
||||
|
||||
RFC3339 / `YYYY-MM-DD[ HH:MM:SS]` by default; `pattern=` is strftime or `rfc3339`.
|
||||
|
||||
**> host_datetime_parse text=`text` pattern=`pattern`**
|
||||
|
||||
## format
|
||||
+ `dt`
|
||||
+ `style`=None
|
||||
|
||||
Styles: `rfc3339` (default), `date`, `time`, or a strftime pattern.
|
||||
|
||||
**> host_datetime_format dt=`dt` style=`style`**
|
||||
|
||||
## add
|
||||
+ `dt`
|
||||
+ `days`=None
|
||||
+ `hours`=None
|
||||
+ `minutes`=None
|
||||
+ `seconds`=None
|
||||
|
||||
**> host_datetime_add dt=`dt` days=`days` hours=`hours` minutes=`minutes` seconds=`seconds`**
|
||||
|
||||
## in_zone
|
||||
+ `dt`
|
||||
+ `zone`
|
||||
|
||||
Re-express the same instant in `+08:00` / `UTC` / fixed aliases like `Asia/Shanghai`.
|
||||
|
||||
**> host_datetime_in_zone dt=`dt` zone=`zone`**
|
||||
+13
-1
@@ -1,6 +1,6 @@
|
||||
---
|
||||
title: lib/encoding
|
||||
description: Base64 and hex encode/decode (Mid M1). UTF-8 text round-trip.
|
||||
description: Base64, hex, and base32 encode/decode (Mid M1 + Mid2 M8). UTF-8 text round-trip.
|
||||
---
|
||||
|
||||
## base64_encode
|
||||
@@ -22,3 +22,15 @@ description: Base64 and hex encode/decode (Mid M1). UTF-8 text round-trip.
|
||||
+ `text`
|
||||
|
||||
**> host_encoding_hex_decode text=`text`**
|
||||
|
||||
## base32_encode
|
||||
+ `text`
|
||||
|
||||
RFC 4648 alphabet; padding with `=`.
|
||||
|
||||
**> host_encoding_base32_encode text=`text`**
|
||||
|
||||
## base32_decode
|
||||
+ `text`
|
||||
|
||||
**> host_encoding_base32_decode text=`text`**
|
||||
@@ -35,11 +35,39 @@ description: English filesystem wrappers
|
||||
|
||||
**> host_make_dir path=`path`**
|
||||
|
||||
## make_dirs
|
||||
+ `path`
|
||||
|
||||
Create directories recursively (`mkdir -p`).
|
||||
|
||||
**> host_make_dirs path=`path`**
|
||||
|
||||
## remove
|
||||
+ `path`
|
||||
|
||||
**> host_remove path=`path`**
|
||||
|
||||
## remove_tree
|
||||
+ `path`
|
||||
|
||||
Remove a directory recursively. Errors if `path` is a file.
|
||||
|
||||
**> host_remove_tree path=`path`**
|
||||
|
||||
## stat
|
||||
+ `path`
|
||||
|
||||
Returns `{size, mtime_unix, is_file, is_dir}`.
|
||||
|
||||
**> host_stat path=`path`**
|
||||
|
||||
## walk
|
||||
+ `path`
|
||||
|
||||
Depth-first listing of relative paths under `path` (forward slashes).
|
||||
|
||||
**> host_walk path=`path`**
|
||||
|
||||
## copy_file
|
||||
+ `src`
|
||||
+ `dest`
|
||||
|
||||
@@ -0,0 +1,14 @@
|
||||
---
|
||||
title: lib/html
|
||||
description: HTML escape / unescape (Mid2 M8). XSS floor for string assembly.
|
||||
---
|
||||
|
||||
## escape
|
||||
+ `text`
|
||||
|
||||
**> host_html_escape text=`text`**
|
||||
|
||||
## unescape
|
||||
+ `text`
|
||||
|
||||
**> host_html_unescape text=`text`**
|
||||
+9
-5
@@ -1,6 +1,6 @@
|
||||
---
|
||||
title: lib/log
|
||||
description: Level-filtered one-line logs (Mid M6). Default level info.
|
||||
description: Level-filtered one-line logs (Mid M6 + Mid2 M10 fields). Default level info.
|
||||
---
|
||||
|
||||
## set_level
|
||||
@@ -12,8 +12,9 @@ level is debug / info / warn / error.
|
||||
|
||||
## debug
|
||||
+ `text`
|
||||
+ `fields`=None
|
||||
|
||||
*line = > host_log_line level="debug" text=`text`*
|
||||
*line = > host_log_line level="debug" text=`text` fields=`fields`*
|
||||
1. `line`
|
||||
> print text=`line`
|
||||
2. *
|
||||
@@ -21,8 +22,9 @@ level is debug / info / warn / error.
|
||||
|
||||
## info
|
||||
+ `text`
|
||||
+ `fields`=None
|
||||
|
||||
*line = > host_log_line level="info" text=`text`*
|
||||
*line = > host_log_line level="info" text=`text` fields=`fields`*
|
||||
1. `line`
|
||||
> print text=`line`
|
||||
2. *
|
||||
@@ -30,8 +32,9 @@ level is debug / info / warn / error.
|
||||
|
||||
## warn
|
||||
+ `text`
|
||||
+ `fields`=None
|
||||
|
||||
*line = > host_log_line level="warn" text=`text`*
|
||||
*line = > host_log_line level="warn" text=`text` fields=`fields`*
|
||||
1. `line`
|
||||
> print text=`line`
|
||||
2. *
|
||||
@@ -39,8 +42,9 @@ level is debug / info / warn / error.
|
||||
|
||||
## error
|
||||
+ `text`
|
||||
+ `fields`=None
|
||||
|
||||
*line = > host_log_line level="error" text=`text`*
|
||||
*line = > host_log_line level="error" text=`text` fields=`fields`*
|
||||
1. `line`
|
||||
> print text=`line`
|
||||
2. *
|
||||
|
||||
@@ -0,0 +1,21 @@
|
||||
---
|
||||
title: lib/stats
|
||||
description: Thin mean / median / sample stdev (Mid2 M10). Not a dataframe library.
|
||||
---
|
||||
|
||||
## mean
|
||||
+ `list`
|
||||
|
||||
**> host_stats_mean list=`list`**
|
||||
|
||||
## median
|
||||
+ `list`
|
||||
|
||||
**> host_stats_median list=`list`**
|
||||
|
||||
## stdev
|
||||
+ `list`
|
||||
|
||||
Sample standard deviation; needs at least two values.
|
||||
|
||||
**> host_stats_stdev list=`list`**
|
||||
@@ -0,0 +1,9 @@
|
||||
---
|
||||
title: lib/toml
|
||||
description: Read-only TOML subset parse (Mid2 M8). Tables, scalars, arrays; no array-of-tables.
|
||||
---
|
||||
|
||||
## parse
|
||||
+ `text`
|
||||
|
||||
**> host_toml_parse text=`text`**
|
||||
@@ -0,0 +1,23 @@
|
||||
---
|
||||
title: lib/url
|
||||
description: Parse URLs and query strings (Mid2 M7). Segment encoding stays in net.url_encode.
|
||||
---
|
||||
|
||||
## parse
|
||||
+ `text`
|
||||
|
||||
Returns `{scheme, userinfo, host, port, path, query, fragment}`.
|
||||
|
||||
**> host_url_parse text=`text`**
|
||||
|
||||
## query_parse
|
||||
+ `text`
|
||||
|
||||
Parse `a=1&b=2` into a map; repeated keys become a list.
|
||||
|
||||
**> host_url_query_parse text=`text`**
|
||||
|
||||
## query_stringify
|
||||
+ `map`
|
||||
|
||||
**> host_url_query_stringify map=`map`**
|
||||
@@ -0,0 +1,19 @@
|
||||
---
|
||||
title: lib/地址
|
||||
description: 解析 URL 与查询串(中层 Mid2 M7)。单段编码仍用 `网络.网址编码`。
|
||||
---
|
||||
|
||||
## 解析
|
||||
+ `内容`
|
||||
|
||||
**> host_url_parse text=`内容`**
|
||||
|
||||
## 查询解析
|
||||
+ `内容`
|
||||
|
||||
**> host_url_query_parse text=`内容`**
|
||||
|
||||
## 查询串化
|
||||
+ `表`
|
||||
|
||||
**> host_url_query_stringify map=`表`**
|
||||
@@ -35,11 +35,39 @@ description: 中文文件系统包装
|
||||
|
||||
**> host_make_dir path=`路径`**
|
||||
|
||||
## 建目录树
|
||||
+ `路径`
|
||||
|
||||
递归创建目录(等同 `mkdir -p`)。
|
||||
|
||||
**> host_make_dirs path=`路径`**
|
||||
|
||||
## 删除
|
||||
+ `路径`
|
||||
|
||||
**> host_remove path=`路径`**
|
||||
|
||||
## 删目录树
|
||||
+ `路径`
|
||||
|
||||
递归删除目录;若路径是文件则报错。
|
||||
|
||||
**> host_remove_tree path=`路径`**
|
||||
|
||||
## 状态
|
||||
+ `路径`
|
||||
|
||||
返回 `{size, mtime_unix, is_file, is_dir}`。
|
||||
|
||||
**> host_stat path=`路径`**
|
||||
|
||||
## 遍历
|
||||
+ `路径`
|
||||
|
||||
深度优先列出相对路径(正斜杠)。
|
||||
|
||||
**> host_walk path=`路径`**
|
||||
|
||||
## 复制文件
|
||||
+ `源`
|
||||
+ `目标`
|
||||
|
||||
+9
-5
@@ -1,6 +1,6 @@
|
||||
---
|
||||
title: lib/日志
|
||||
description: 按级别过滤的一行日志(中层 M6)。默认级别 info。
|
||||
description: 按级别过滤的一行日志(中层 M6 + Mid2 M10 字段)。默认级别 info。
|
||||
---
|
||||
|
||||
## 设级别
|
||||
@@ -12,8 +12,9 @@ description: 按级别过滤的一行日志(中层 M6)。默认级别 info
|
||||
|
||||
## 调试
|
||||
+ `内容`
|
||||
+ `字段`=None
|
||||
|
||||
*line = > host_log_line level="debug" text=`内容`*
|
||||
*line = > host_log_line level="debug" text=`内容` fields=`字段`*
|
||||
1. `line`
|
||||
> 打印 内容=`line`
|
||||
2. *
|
||||
@@ -21,8 +22,9 @@ description: 按级别过滤的一行日志(中层 M6)。默认级别 info
|
||||
|
||||
## 信息
|
||||
+ `内容`
|
||||
+ `字段`=None
|
||||
|
||||
*line = > host_log_line level="info" text=`内容`*
|
||||
*line = > host_log_line level="info" text=`内容` fields=`字段`*
|
||||
1. `line`
|
||||
> 打印 内容=`line`
|
||||
2. *
|
||||
@@ -30,8 +32,9 @@ description: 按级别过滤的一行日志(中层 M6)。默认级别 info
|
||||
|
||||
## 警告
|
||||
+ `内容`
|
||||
+ `字段`=None
|
||||
|
||||
*line = > host_log_line level="warn" text=`内容`*
|
||||
*line = > host_log_line level="warn" text=`内容` fields=`字段`*
|
||||
1. `line`
|
||||
> 打印 内容=`line`
|
||||
2. *
|
||||
@@ -39,8 +42,9 @@ description: 按级别过滤的一行日志(中层 M6)。默认级别 info
|
||||
|
||||
## 错误
|
||||
+ `内容`
|
||||
+ `字段`=None
|
||||
|
||||
*line = > host_log_line level="error" text=`内容`*
|
||||
*line = > host_log_line level="error" text=`内容` fields=`字段`*
|
||||
1. `line`
|
||||
> 打印 内容=`line`
|
||||
2. *
|
||||
|
||||
@@ -0,0 +1,46 @@
|
||||
---
|
||||
title: lib/日期时间
|
||||
description: 日历时刻 map `{unix, zone, iso}`(中层 Mid2 M7)。固定偏移与少量 IANA 别名。
|
||||
---
|
||||
|
||||
## 现在
|
||||
|
||||
**> host_datetime_now**
|
||||
|
||||
## 自戳
|
||||
+ `秒`
|
||||
+ `区`=None
|
||||
|
||||
**> host_datetime_from_unix unix=`秒` zone=`区`**
|
||||
|
||||
## 成戳
|
||||
+ `时刻`
|
||||
|
||||
**> host_datetime_to_unix dt=`时刻`**
|
||||
|
||||
## 解析
|
||||
+ `内容`
|
||||
+ `格式`=None
|
||||
|
||||
**> host_datetime_parse text=`内容` pattern=`格式`**
|
||||
|
||||
## 格式化
|
||||
+ `时刻`
|
||||
+ `样式`=None
|
||||
|
||||
**> host_datetime_format dt=`时刻` style=`样式`**
|
||||
|
||||
## 加
|
||||
+ `时刻`
|
||||
+ `天`=None
|
||||
+ `小时`=None
|
||||
+ `分钟`=None
|
||||
+ `秒数`=None
|
||||
|
||||
**> host_datetime_add dt=`时刻` days=`天` hours=`小时` minutes=`分钟` seconds=`秒数`**
|
||||
|
||||
## 时区
|
||||
+ `时刻`
|
||||
+ `区`
|
||||
|
||||
**> host_datetime_in_zone dt=`时刻` zone=`区`**
|
||||
@@ -0,0 +1,21 @@
|
||||
---
|
||||
title: lib/统计
|
||||
description: 薄均值 / 中位数 / 样本标准差(中层 Mid2 M10)。非数据框库。
|
||||
---
|
||||
|
||||
## 均值
|
||||
+ `列表`
|
||||
|
||||
**> host_stats_mean list=`列表`**
|
||||
|
||||
## 中位数
|
||||
+ `列表`
|
||||
|
||||
**> host_stats_median list=`列表`**
|
||||
|
||||
## 标准差
|
||||
+ `列表`
|
||||
|
||||
样本标准差;至少两个值。
|
||||
|
||||
**> host_stats_stdev list=`列表`**
|
||||
+11
-1
@@ -1,6 +1,6 @@
|
||||
---
|
||||
title: lib/编码
|
||||
description: Base64 与十六进制编解码(中层 M1)。UTF-8 文本往返。
|
||||
description: Base64、十六进制与基32编解码(中层 M1 + Mid2 M8)。UTF-8 文本往返。
|
||||
---
|
||||
|
||||
## 基64编码
|
||||
@@ -22,3 +22,13 @@ description: Base64 与十六进制编解码(中层 M1)。UTF-8 文本往返
|
||||
+ `内容`
|
||||
|
||||
**> host_encoding_hex_decode text=`内容`**
|
||||
|
||||
## 基32编码
|
||||
+ `内容`
|
||||
|
||||
**> host_encoding_base32_encode text=`内容`**
|
||||
|
||||
## 基32解码
|
||||
+ `内容`
|
||||
|
||||
**> host_encoding_base32_decode text=`内容`**
|
||||
@@ -0,0 +1,14 @@
|
||||
---
|
||||
title: lib/超文本
|
||||
description: HTML 转义 / 还原(中层 Mid2 M8)。拼装字符串时的 XSS 底线。
|
||||
---
|
||||
|
||||
## 转义
|
||||
+ `内容`
|
||||
|
||||
**> host_html_escape text=`内容`**
|
||||
|
||||
## 还原
|
||||
+ `内容`
|
||||
|
||||
**> host_html_unescape text=`内容`**
|
||||
@@ -0,0 +1,9 @@
|
||||
---
|
||||
title: lib/配置表
|
||||
description: 只读 TOML 子集解析(中层 Mid2 M8)。表 / 标量 / 数组;无数组表。
|
||||
---
|
||||
|
||||
## 解析
|
||||
+ `内容`
|
||||
|
||||
**> host_toml_parse text=`内容`**
|
||||
@@ -0,0 +1,19 @@
|
||||
---
|
||||
title: Mid stdlib — datetime and url
|
||||
description: Calendar moments + URL/query parse (Mid2 M7)
|
||||
import dt:lib/datetime.mq.md
|
||||
import url:lib/url.mq.md
|
||||
---
|
||||
|
||||
# Time and addresses without plugins
|
||||
|
||||
Moments are maps `{unix, zone, iso}`. Parse HTTPS URLs and round-trip query strings in `lib/url` (segment encoding stays in `net.url_encode`).
|
||||
|
||||
# main
|
||||
|
||||
*epoch = > dt.from_unix unix=0 zone="Asia/Shanghai"*
|
||||
> print text=`epoch`[^iso]
|
||||
|
||||
*u = > url.parse text="https://example.com/path?q=1#top"*
|
||||
> print text=`u`[^host]
|
||||
> print text=`u`[^query]
|
||||
@@ -0,0 +1,19 @@
|
||||
---
|
||||
title: 中层标准库 — 日期时间与地址
|
||||
description: 日历时刻 + URL/查询串(Mid2 M7)
|
||||
导入 日时:lib/日期时间.mq.md
|
||||
导入 址:lib/地址.mq.md
|
||||
---
|
||||
|
||||
# 无需插件的时间与地址
|
||||
|
||||
时刻是 map `{unix, zone, iso}`。用 `地址` 拆 HTTPS URL 与查询串。
|
||||
|
||||
# main
|
||||
|
||||
*epoch = > 日时.自戳 秒=0 区="Asia/Shanghai"*
|
||||
> print text=`epoch`[^iso]
|
||||
|
||||
*u = > 址.解析 内容="https://example.com/path?q=1"*
|
||||
> print text=`u`[^host]
|
||||
> print text=`u`[^query]
|
||||
@@ -0,0 +1,24 @@
|
||||
---
|
||||
title: Mid stdlib — toml, html, base32
|
||||
description: Config TOML + HTML escape + base32 (Mid2 M8)
|
||||
import toml:lib/toml.mq.md
|
||||
import html:lib/html.mq.md
|
||||
import enc:lib/encoding.mq.md
|
||||
---
|
||||
|
||||
# Config and safe text without plugins
|
||||
|
||||
Parse a TOML subset for tools, escape HTML before assembly, encode with base32.
|
||||
|
||||
# main
|
||||
|
||||
*cfg = > toml.parse text="app = \"demo\"\n[server]\nport = 8080\n"*
|
||||
> print text=`cfg`[^app]
|
||||
*srv = `cfg`[^server]*
|
||||
> print text=`srv`[^port]
|
||||
|
||||
*safe = > html.escape text="<tag>"*
|
||||
> print text=`safe`
|
||||
|
||||
*b = > enc.base32_encode text="ok"*
|
||||
> print text=`b`
|
||||
@@ -0,0 +1,20 @@
|
||||
---
|
||||
title: 中层标准库 — 配置表、超文本、基32
|
||||
description: TOML 配置 + HTML 转义 + base32(Mid2 M8)
|
||||
导入 配置:lib/配置表.mq.md
|
||||
导入 超:lib/超文本.mq.md
|
||||
导入 编:lib/编码.mq.md
|
||||
---
|
||||
|
||||
# 无需插件的配置与安全字面
|
||||
|
||||
# main
|
||||
|
||||
*cfg = > 配置.解析 内容="app = \"演示\"\n"*
|
||||
> print text=`cfg`[^app]
|
||||
|
||||
*safe = > 超.转义 内容="<tag>"*
|
||||
> print text=`safe`
|
||||
|
||||
*b = > 编.基32编码 内容="ok"*
|
||||
> print text=`b`
|
||||
@@ -0,0 +1,24 @@
|
||||
---
|
||||
title: Mid stdlib — fs make_dirs, walk, stat
|
||||
description: Recursive dirs, walk, and file metadata (Mid2 M9)
|
||||
import fs:lib/fs.mq.md
|
||||
---
|
||||
|
||||
# Practical filesystem without plugins
|
||||
|
||||
`make_dirs` / `remove_tree` / `stat` / `walk` thicken `lib/fs` for scripts and tools.
|
||||
|
||||
# main
|
||||
|
||||
> fs.make_dirs path="m9-demo/sub"
|
||||
|
||||
> fs.write_text path="m9-demo/readme.txt" text="ok"
|
||||
|
||||
*st = > fs.stat path="m9-demo/readme.txt"*
|
||||
> print text=`st`[^size]
|
||||
|
||||
*w = > fs.walk path="m9-demo"*
|
||||
*n = > len `w`*
|
||||
> print text=`n`
|
||||
|
||||
> fs.remove_tree path="m9-demo"
|
||||
@@ -0,0 +1,22 @@
|
||||
---
|
||||
title: 中层标准库 — 文件目录树与状态
|
||||
description: 递归目录、遍历与元数据(Mid2 M9)
|
||||
导入 文件:lib/文件.mq.md
|
||||
---
|
||||
|
||||
# 无需插件的实用文件系统
|
||||
|
||||
# main
|
||||
|
||||
> 文件.建目录树 路径="m9-演示/子"
|
||||
|
||||
> 文件.写文本 路径="m9-演示/说明.txt" 内容="好"
|
||||
|
||||
*st = > 文件.状态 路径="m9-演示/说明.txt"*
|
||||
> print text=`st`[^size]
|
||||
|
||||
*w = > 文件.遍历 路径="m9-演示"*
|
||||
*n = > 长度 `w`*
|
||||
> print text=`n`
|
||||
|
||||
> 文件.删目录树 路径="m9-演示"
|
||||
@@ -0,0 +1,31 @@
|
||||
---
|
||||
title: Mid stdlib — stats and log fields
|
||||
description: Thin mean/median/stdev + structured log fields (Mid2 M10)
|
||||
import stats:lib/stats.mq.md
|
||||
import log:lib/log.mq.md
|
||||
---
|
||||
|
||||
# Closing Mid2 sugar
|
||||
|
||||
Light statistics and optional `fields=` on log lines — no remote sinks, no dataframes.
|
||||
|
||||
# main
|
||||
|
||||
`xs` =
|
||||
|
||||
| |
|
||||
|---|
|
||||
| 10 |
|
||||
| 20 |
|
||||
| 30 |
|
||||
|
||||
*m = > stats.mean list=`xs`*
|
||||
> print text=`m`
|
||||
|
||||
`fld` =
|
||||
|
||||
| step |
|
||||
|------|
|
||||
| done |
|
||||
|
||||
> log.info text="mid2-m10" fields=`fld`
|
||||
@@ -0,0 +1,29 @@
|
||||
---
|
||||
title: 中层标准库 — 统计与日志字段
|
||||
description: 薄均值/中位数/标准差 + 日志 fields(Mid2 M10)
|
||||
导入 统计:lib/统计.mq.md
|
||||
导入 日志:lib/日志.mq.md
|
||||
---
|
||||
|
||||
# Mid2 收口糖
|
||||
|
||||
# main
|
||||
|
||||
`xs` =
|
||||
|
||||
| |
|
||||
|---|
|
||||
| 10 |
|
||||
| 20 |
|
||||
| 30 |
|
||||
|
||||
*m = > 统计.均值 列表=`xs`*
|
||||
> print text=`m`
|
||||
|
||||
`fld` =
|
||||
|
||||
| 步骤 | 状态 |
|
||||
|------|------|
|
||||
| 完成 | ok |
|
||||
|
||||
> 日志.信息 内容="mid2-m10" 字段=`fld`
|
||||
@@ -0,0 +1,302 @@
|
||||
//! Calendar / timezone subset for Mid2 M7 (`lib/datetime`).
|
||||
//!
|
||||
//! Moments are plain maps: `{unix, zone, iso}`. Zone is a fixed offset (`+08:00`)
|
||||
//! or alias (`UTC`); a few fixed-offset IANA names are accepted. Full tzdb is out of scope.
|
||||
|
||||
use chrono::{DateTime, Duration, FixedOffset, NaiveDate, NaiveDateTime, TimeZone, Utc};
|
||||
|
||||
use crate::value::Value;
|
||||
|
||||
fn as_i64(v: &Value, label: &str) -> Result<i64, String> {
|
||||
match v {
|
||||
Value::Int(n) => Ok(*n),
|
||||
_ => Err(format!("{label} must be int")),
|
||||
}
|
||||
}
|
||||
|
||||
fn as_text<'a>(v: &'a Value, label: &str) -> Result<&'a str, String> {
|
||||
match v {
|
||||
Value::Text(s) => Ok(s.as_str()),
|
||||
_ => Err(format!("{label} must be text")),
|
||||
}
|
||||
}
|
||||
|
||||
fn optional_i64(v: Option<&Value>, label: &str) -> Result<i64, String> {
|
||||
match v {
|
||||
None | Some(Value::None) => Ok(0),
|
||||
Some(x) => as_i64(x, label),
|
||||
}
|
||||
}
|
||||
|
||||
fn format_offset(off: FixedOffset) -> String {
|
||||
let secs = off.local_minus_utc();
|
||||
let sign = if secs >= 0 { '+' } else { '-' };
|
||||
let abs = secs.abs();
|
||||
let h = abs / 3600;
|
||||
let m = (abs % 3600) / 60;
|
||||
format!("{sign}{h:02}:{m:02}")
|
||||
}
|
||||
|
||||
fn parse_zone(s: &str) -> Result<FixedOffset, String> {
|
||||
let s = s.trim();
|
||||
if s.is_empty() || s.eq_ignore_ascii_case("utc") || s.eq_ignore_ascii_case("gmt") || s == "Z" {
|
||||
return FixedOffset::east_opt(0).ok_or_else(|| "invalid UTC offset".into());
|
||||
}
|
||||
// Common fixed-offset IANA aliases (no DST).
|
||||
let aliased = match s {
|
||||
"Asia/Shanghai" | "Asia/Hong_Kong" | "Asia/Taipei" | "Asia/Singapore" => Some(8 * 3600),
|
||||
"Asia/Tokyo" | "Asia/Seoul" => Some(9 * 3600),
|
||||
"Asia/Kolkata" | "Asia/Calcutta" => Some(5 * 3600 + 30 * 60),
|
||||
"Europe/Moscow" => Some(3 * 3600),
|
||||
"America/Phoenix" => Some(-7 * 3600),
|
||||
"Pacific/Honolulu" => Some(-10 * 3600),
|
||||
_ => None,
|
||||
};
|
||||
if let Some(secs) = aliased {
|
||||
return FixedOffset::east_opt(secs).ok_or_else(|| format!("invalid zone: {s}"));
|
||||
}
|
||||
let (sign, rest) = if let Some(r) = s.strip_prefix('+') {
|
||||
(1i32, r)
|
||||
} else if let Some(r) = s.strip_prefix('-') {
|
||||
(-1i32, r)
|
||||
} else {
|
||||
return Err(format!(
|
||||
"unknown zone {s:?}; use +HH:MM / -HH:MM / UTC or a fixed-offset alias (e.g. Asia/Shanghai)"
|
||||
));
|
||||
};
|
||||
let (hh, mm) = if let Some((h, m)) = rest.split_once(':') {
|
||||
(
|
||||
h.parse::<i32>()
|
||||
.map_err(|_| format!("bad zone hour in {s}"))?,
|
||||
m.parse::<i32>()
|
||||
.map_err(|_| format!("bad zone minute in {s}"))?,
|
||||
)
|
||||
} else if rest.len() == 4 && rest.chars().all(|c| c.is_ascii_digit()) {
|
||||
(
|
||||
rest[..2]
|
||||
.parse::<i32>()
|
||||
.map_err(|_| format!("bad zone hour in {s}"))?,
|
||||
rest[2..]
|
||||
.parse::<i32>()
|
||||
.map_err(|_| format!("bad zone minute in {s}"))?,
|
||||
)
|
||||
} else if rest.len() == 2 && rest.chars().all(|c| c.is_ascii_digit()) {
|
||||
(
|
||||
rest.parse::<i32>()
|
||||
.map_err(|_| format!("bad zone hour in {s}"))?,
|
||||
0,
|
||||
)
|
||||
} else {
|
||||
return Err(format!("bad zone offset {s}"));
|
||||
};
|
||||
if !(0..=14).contains(&hh) || !(0..60).contains(&mm) {
|
||||
return Err(format!("zone offset out of range: {s}"));
|
||||
}
|
||||
let secs = sign * (hh * 3600 + mm * 60);
|
||||
FixedOffset::east_opt(secs).ok_or_else(|| format!("invalid zone offset: {s}"))
|
||||
}
|
||||
|
||||
fn moment(unix: i64, zone: FixedOffset) -> Result<Value, String> {
|
||||
let dt = zone
|
||||
.timestamp_opt(unix, 0)
|
||||
.single()
|
||||
.ok_or_else(|| format!("invalid unix timestamp: {unix}"))?;
|
||||
Ok(Value::Map(vec![
|
||||
("unix".into(), Value::Int(unix)),
|
||||
("zone".into(), Value::Text(format_offset(zone))),
|
||||
(
|
||||
"iso".into(),
|
||||
Value::Text(dt.to_rfc3339_opts(chrono::SecondsFormat::Secs, true)),
|
||||
),
|
||||
]))
|
||||
}
|
||||
|
||||
fn zone_of_moment(m: &[(String, Value)]) -> Result<FixedOffset, String> {
|
||||
for (k, v) in m {
|
||||
if k == "zone" {
|
||||
return parse_zone(as_text(v, "zone")?);
|
||||
}
|
||||
}
|
||||
Ok(FixedOffset::east_opt(0).unwrap())
|
||||
}
|
||||
|
||||
fn unix_of_value(v: &Value) -> Result<(i64, FixedOffset), String> {
|
||||
match v {
|
||||
Value::Int(n) => Ok((*n, FixedOffset::east_opt(0).unwrap())),
|
||||
Value::Map(entries) => {
|
||||
let mut unix = None;
|
||||
for (k, val) in entries {
|
||||
if k == "unix" {
|
||||
unix = Some(as_i64(val, "unix")?);
|
||||
}
|
||||
}
|
||||
let unix = unix.ok_or_else(|| "datetime map needs unix".to_string())?;
|
||||
Ok((unix, zone_of_moment(entries)?))
|
||||
}
|
||||
Value::Text(s) => {
|
||||
// Treat bare ISO/RFC3339 text as a moment.
|
||||
let parsed = parse_text(s, None)?;
|
||||
unix_of_value(&parsed)
|
||||
}
|
||||
_ => Err("datetime needs int unix, moment map, or ISO text".into()),
|
||||
}
|
||||
}
|
||||
|
||||
pub fn now() -> Result<Value, String> {
|
||||
#[cfg(target_arch = "wasm32")]
|
||||
{
|
||||
return Err("datetime.now unavailable in browser wasm (no clock bridge yet)".into());
|
||||
}
|
||||
#[cfg(not(target_arch = "wasm32"))]
|
||||
{
|
||||
let secs = Utc::now().timestamp();
|
||||
moment(secs, FixedOffset::east_opt(0).unwrap())
|
||||
}
|
||||
}
|
||||
|
||||
pub fn from_unix(unix: &Value, zone: Option<&Value>) -> Result<Value, String> {
|
||||
let secs = as_i64(unix, "unix")?;
|
||||
let off = match zone {
|
||||
None | Some(Value::None) => FixedOffset::east_opt(0).unwrap(),
|
||||
Some(z) => parse_zone(as_text(z, "zone")?)?,
|
||||
};
|
||||
moment(secs, off)
|
||||
}
|
||||
|
||||
pub fn to_unix(dt: &Value) -> Result<Value, String> {
|
||||
let (secs, _) = unix_of_value(dt)?;
|
||||
Ok(Value::Int(secs))
|
||||
}
|
||||
|
||||
fn parse_text(text: &str, pattern: Option<&str>) -> Result<Value, String> {
|
||||
if let Some(pat) = pattern {
|
||||
if pat.eq_ignore_ascii_case("rfc3339") || pat.eq_ignore_ascii_case("iso") {
|
||||
return parse_rfc3339(text);
|
||||
}
|
||||
if let Ok(dt) = DateTime::parse_from_str(text, pat) {
|
||||
return moment(dt.timestamp(), *dt.offset());
|
||||
}
|
||||
let naive = NaiveDateTime::parse_from_str(text, pat)
|
||||
.or_else(|_| {
|
||||
NaiveDate::parse_from_str(text, pat).map(|d| d.and_hms_opt(0, 0, 0).unwrap())
|
||||
})
|
||||
.map_err(|e| format!("datetime.parse: {e}"))?;
|
||||
return moment(naive.and_utc().timestamp(), FixedOffset::east_opt(0).unwrap());
|
||||
}
|
||||
if let Ok(v) = parse_rfc3339(text) {
|
||||
return Ok(v);
|
||||
}
|
||||
if let Ok(dt) = NaiveDateTime::parse_from_str(text, "%Y-%m-%d %H:%M:%S") {
|
||||
return moment(dt.and_utc().timestamp(), FixedOffset::east_opt(0).unwrap());
|
||||
}
|
||||
if let Ok(dt) = NaiveDateTime::parse_from_str(text, "%Y-%m-%dT%H:%M:%S") {
|
||||
return moment(dt.and_utc().timestamp(), FixedOffset::east_opt(0).unwrap());
|
||||
}
|
||||
if let Ok(d) = NaiveDate::parse_from_str(text, "%Y-%m-%d") {
|
||||
let dt = d.and_hms_opt(0, 0, 0).unwrap();
|
||||
return moment(dt.and_utc().timestamp(), FixedOffset::east_opt(0).unwrap());
|
||||
}
|
||||
Err(format!(
|
||||
"datetime.parse: unrecognized {text:?}; pass pattern= or use RFC3339 / YYYY-MM-DD"
|
||||
))
|
||||
}
|
||||
|
||||
fn parse_rfc3339(text: &str) -> Result<Value, String> {
|
||||
let dt = DateTime::parse_from_rfc3339(text).map_err(|e| format!("datetime.parse: {e}"))?;
|
||||
moment(dt.timestamp(), *dt.offset())
|
||||
}
|
||||
|
||||
pub fn parse(text: &Value, pattern: Option<&Value>) -> Result<Value, String> {
|
||||
let t = as_text(text, "text")?;
|
||||
let pat = match pattern {
|
||||
None | Some(Value::None) => None,
|
||||
Some(p) => Some(as_text(p, "pattern")?),
|
||||
};
|
||||
parse_text(t, pat)
|
||||
}
|
||||
|
||||
pub fn format(dt: &Value, style: Option<&Value>) -> Result<Value, String> {
|
||||
let (secs, zone) = unix_of_value(dt)?;
|
||||
let local = zone
|
||||
.timestamp_opt(secs, 0)
|
||||
.single()
|
||||
.ok_or_else(|| format!("invalid unix timestamp: {secs}"))?;
|
||||
let style = match style {
|
||||
None | Some(Value::None) => "rfc3339",
|
||||
Some(s) => as_text(s, "style")?,
|
||||
};
|
||||
let out = match style {
|
||||
"rfc3339" | "iso" => local.to_rfc3339_opts(chrono::SecondsFormat::Secs, true),
|
||||
"date" => local.format("%Y-%m-%d").to_string(),
|
||||
"time" => local.format("%H:%M:%S").to_string(),
|
||||
other => local.format(other).to_string(),
|
||||
};
|
||||
Ok(Value::Text(out))
|
||||
}
|
||||
|
||||
pub fn add(
|
||||
dt: &Value,
|
||||
days: Option<&Value>,
|
||||
hours: Option<&Value>,
|
||||
minutes: Option<&Value>,
|
||||
seconds: Option<&Value>,
|
||||
) -> Result<Value, String> {
|
||||
let (secs, zone) = unix_of_value(dt)?;
|
||||
let days = optional_i64(days, "days")?;
|
||||
let hours = optional_i64(hours, "hours")?;
|
||||
let minutes = optional_i64(minutes, "minutes")?;
|
||||
let seconds = optional_i64(seconds, "seconds")?;
|
||||
let delta = Duration::days(days)
|
||||
+ Duration::hours(hours)
|
||||
+ Duration::minutes(minutes)
|
||||
+ Duration::seconds(seconds);
|
||||
let new_secs = secs
|
||||
.checked_add(delta.num_seconds())
|
||||
.ok_or_else(|| "datetime.add overflow".to_string())?;
|
||||
moment(new_secs, zone)
|
||||
}
|
||||
|
||||
pub fn in_zone(dt: &Value, zone: &Value) -> Result<Value, String> {
|
||||
let (secs, _) = unix_of_value(dt)?;
|
||||
let off = parse_zone(as_text(zone, "zone")?)?;
|
||||
moment(secs, off)
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
|
||||
#[test]
|
||||
fn from_unix_utc_iso() {
|
||||
let m = from_unix(&Value::Int(0), None).unwrap();
|
||||
let Value::Map(entries) = m else { panic!() };
|
||||
let iso = entries.iter().find(|(k, _)| k == "iso").unwrap().1.clone();
|
||||
assert_eq!(iso, Value::Text("1970-01-01T00:00:00Z".into()));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn shanghai_alias() {
|
||||
let m = from_unix(&Value::Int(0), Some(&Value::Text("Asia/Shanghai".into()))).unwrap();
|
||||
let Value::Map(entries) = m else { panic!() };
|
||||
let iso = entries.iter().find(|(k, _)| k == "iso").unwrap().1.clone();
|
||||
assert_eq!(iso, Value::Text("1970-01-01T08:00:00+08:00".into()));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn parse_rfc3339_roundtrip() {
|
||||
let m = parse(
|
||||
&Value::Text("2020-01-02T03:04:05+08:00".into()),
|
||||
None,
|
||||
)
|
||||
.unwrap();
|
||||
let u = to_unix(&m).unwrap();
|
||||
assert_eq!(u, Value::Int(1_577_905_445));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn add_day() {
|
||||
let m = from_unix(&Value::Int(0), None).unwrap();
|
||||
let n = add(&m, Some(&Value::Int(1)), None, None, None).unwrap();
|
||||
assert_eq!(to_unix(&n).unwrap(), Value::Int(86_400));
|
||||
}
|
||||
}
|
||||
+148
-4
@@ -3,8 +3,8 @@
|
||||
use std::collections::HashMap;
|
||||
|
||||
use crate::host::{
|
||||
cli, csv, encoding, fs, hash, json, log, math, net, path, re, secrets, sys, text_ops, time,
|
||||
uuid_ops, writeback, HostContext,
|
||||
cli, csv, datetime, encoding, fs, hash, html_ops, json, log, math, net, path, re, secrets, stats,
|
||||
sys, text_ops, time, toml_ops, url_ops, uuid_ops, writeback, HostContext,
|
||||
};
|
||||
#[cfg(feature = "exec-host")]
|
||||
use crate::host::{foreign, subtask};
|
||||
@@ -176,6 +176,28 @@ pub enum HostFn {
|
||||
LogSetLevel = 167,
|
||||
LogLine = 168,
|
||||
UuidV4 = 169,
|
||||
DatetimeNow = 170,
|
||||
DatetimeFromUnix = 171,
|
||||
DatetimeToUnix = 172,
|
||||
DatetimeParse = 173,
|
||||
DatetimeFormat = 174,
|
||||
DatetimeAdd = 175,
|
||||
DatetimeInZone = 176,
|
||||
UrlParse = 177,
|
||||
UrlQueryParse = 178,
|
||||
UrlQueryStringify = 179,
|
||||
TomlParse = 180,
|
||||
HtmlEscape = 181,
|
||||
HtmlUnescape = 182,
|
||||
EncodingBase32Encode = 183,
|
||||
EncodingBase32Decode = 184,
|
||||
FsMakeDirs = 185,
|
||||
FsRemoveTree = 186,
|
||||
FsStat = 187,
|
||||
FsWalk = 188,
|
||||
StatsMean = 189,
|
||||
StatsMedian = 190,
|
||||
StatsStdev = 191,
|
||||
}
|
||||
|
||||
|
||||
@@ -342,6 +364,28 @@ impl HostFn {
|
||||
167 => Self::LogSetLevel,
|
||||
168 => Self::LogLine,
|
||||
169 => Self::UuidV4,
|
||||
170 => Self::DatetimeNow,
|
||||
171 => Self::DatetimeFromUnix,
|
||||
172 => Self::DatetimeToUnix,
|
||||
173 => Self::DatetimeParse,
|
||||
174 => Self::DatetimeFormat,
|
||||
175 => Self::DatetimeAdd,
|
||||
176 => Self::DatetimeInZone,
|
||||
177 => Self::UrlParse,
|
||||
178 => Self::UrlQueryParse,
|
||||
179 => Self::UrlQueryStringify,
|
||||
180 => Self::TomlParse,
|
||||
181 => Self::HtmlEscape,
|
||||
182 => Self::HtmlUnescape,
|
||||
183 => Self::EncodingBase32Encode,
|
||||
184 => Self::EncodingBase32Decode,
|
||||
185 => Self::FsMakeDirs,
|
||||
186 => Self::FsRemoveTree,
|
||||
187 => Self::FsStat,
|
||||
188 => Self::FsWalk,
|
||||
189 => Self::StatsMean,
|
||||
190 => Self::StatsMedian,
|
||||
191 => Self::StatsStdev,
|
||||
_ => return None,
|
||||
})
|
||||
}
|
||||
@@ -511,6 +555,28 @@ impl HostFn {
|
||||
"host_log_set_level" | "log_set_level" => Self::LogSetLevel,
|
||||
"host_log_line" | "log_line" => Self::LogLine,
|
||||
"host_uuid_v4" | "uuid_v4" => Self::UuidV4,
|
||||
"host_datetime_now" | "datetime_now" => Self::DatetimeNow,
|
||||
"host_datetime_from_unix" | "datetime_from_unix" => Self::DatetimeFromUnix,
|
||||
"host_datetime_to_unix" | "datetime_to_unix" => Self::DatetimeToUnix,
|
||||
"host_datetime_parse" | "datetime_parse" => Self::DatetimeParse,
|
||||
"host_datetime_format" | "datetime_format" => Self::DatetimeFormat,
|
||||
"host_datetime_add" | "datetime_add" => Self::DatetimeAdd,
|
||||
"host_datetime_in_zone" | "datetime_in_zone" => Self::DatetimeInZone,
|
||||
"host_url_parse" | "url_parse" => Self::UrlParse,
|
||||
"host_url_query_parse" | "url_query_parse" => Self::UrlQueryParse,
|
||||
"host_url_query_stringify" | "url_query_stringify" => Self::UrlQueryStringify,
|
||||
"host_toml_parse" | "toml_parse" => Self::TomlParse,
|
||||
"host_html_escape" | "html_escape" => Self::HtmlEscape,
|
||||
"host_html_unescape" | "html_unescape" => Self::HtmlUnescape,
|
||||
"host_encoding_base32_encode" | "encoding_base32_encode" => Self::EncodingBase32Encode,
|
||||
"host_encoding_base32_decode" | "encoding_base32_decode" => Self::EncodingBase32Decode,
|
||||
"host_make_dirs" | "make_dirs" => Self::FsMakeDirs,
|
||||
"host_remove_tree" | "remove_tree" => Self::FsRemoveTree,
|
||||
"host_stat" | "stat" => Self::FsStat,
|
||||
"host_walk" | "walk" => Self::FsWalk,
|
||||
"host_stats_mean" | "stats_mean" => Self::StatsMean,
|
||||
"host_stats_median" | "stats_median" => Self::StatsMedian,
|
||||
"host_stats_stdev" | "stats_stdev" => Self::StatsStdev,
|
||||
_ => return None,
|
||||
})
|
||||
}
|
||||
@@ -667,6 +733,28 @@ impl HostFn {
|
||||
Self::LogSetLevel => "host_log_set_level",
|
||||
Self::LogLine => "host_log_line",
|
||||
Self::UuidV4 => "host_uuid_v4",
|
||||
Self::DatetimeNow => "host_datetime_now",
|
||||
Self::DatetimeFromUnix => "host_datetime_from_unix",
|
||||
Self::DatetimeToUnix => "host_datetime_to_unix",
|
||||
Self::DatetimeParse => "host_datetime_parse",
|
||||
Self::DatetimeFormat => "host_datetime_format",
|
||||
Self::DatetimeAdd => "host_datetime_add",
|
||||
Self::DatetimeInZone => "host_datetime_in_zone",
|
||||
Self::UrlParse => "host_url_parse",
|
||||
Self::UrlQueryParse => "host_url_query_parse",
|
||||
Self::UrlQueryStringify => "host_url_query_stringify",
|
||||
Self::TomlParse => "host_toml_parse",
|
||||
Self::HtmlEscape => "host_html_escape",
|
||||
Self::HtmlUnescape => "host_html_unescape",
|
||||
Self::EncodingBase32Encode => "host_encoding_base32_encode",
|
||||
Self::EncodingBase32Decode => "host_encoding_base32_decode",
|
||||
Self::FsMakeDirs => "host_make_dirs",
|
||||
Self::FsRemoveTree => "host_remove_tree",
|
||||
Self::FsStat => "host_stat",
|
||||
Self::FsWalk => "host_walk",
|
||||
Self::StatsMean => "host_stats_mean",
|
||||
Self::StatsMedian => "host_stats_median",
|
||||
Self::StatsStdev => "host_stats_stdev",
|
||||
Self::WritebackRecord => "host_writeback_record",
|
||||
Self::WritebackGet => "host_writeback_get",
|
||||
Self::WritebackClear => "host_writeback_clear",
|
||||
@@ -759,7 +847,9 @@ impl HostFn {
|
||||
Self::EncodingBase64Encode
|
||||
| Self::EncodingBase64Decode
|
||||
| Self::EncodingHexEncode
|
||||
| Self::EncodingHexDecode => &["text"],
|
||||
| Self::EncodingHexDecode
|
||||
| Self::EncodingBase32Encode
|
||||
| Self::EncodingBase32Decode => &["text"],
|
||||
Self::PathJoin => &["a", "b"],
|
||||
Self::PathSplit
|
||||
| Self::PathFileName
|
||||
@@ -789,6 +879,18 @@ impl HostFn {
|
||||
Self::LogSetLevel => &["level"],
|
||||
Self::LogLine => &["level", "text"],
|
||||
Self::UuidV4 => &[],
|
||||
Self::StatsMean | Self::StatsMedian | Self::StatsStdev => &["list"],
|
||||
Self::DatetimeNow => &[],
|
||||
Self::DatetimeFromUnix => &["unix"],
|
||||
Self::DatetimeToUnix => &["dt"],
|
||||
Self::DatetimeParse => &["text"],
|
||||
Self::DatetimeFormat => &["dt"],
|
||||
Self::DatetimeAdd => &["dt"],
|
||||
Self::DatetimeInZone => &["dt", "zone"],
|
||||
Self::UrlParse | Self::UrlQueryParse => &["text"],
|
||||
Self::UrlQueryStringify => &["map"],
|
||||
Self::TomlParse | Self::HtmlEscape | Self::HtmlUnescape => &["text"],
|
||||
Self::FsMakeDirs | Self::FsRemoveTree | Self::FsStat | Self::FsWalk => &["path"],
|
||||
Self::WritebackRecord => &["value"],
|
||||
Self::WritebackGet | Self::WritebackClear => &[],
|
||||
Self::WritebackList => &[],
|
||||
@@ -827,6 +929,11 @@ impl HostFn {
|
||||
Self::TextReplace => &["count"],
|
||||
Self::TextPad => &["fill", "align"],
|
||||
Self::CliParse => &["args"],
|
||||
Self::DatetimeFromUnix => &["zone"],
|
||||
Self::DatetimeParse => &["pattern"],
|
||||
Self::DatetimeFormat => &["style"],
|
||||
Self::DatetimeAdd => &["days", "hours", "minutes", "seconds"],
|
||||
Self::LogLine => &["fields"],
|
||||
_ => &[],
|
||||
}
|
||||
}
|
||||
@@ -855,6 +962,10 @@ pub fn call_host(
|
||||
HostFn::ListDir => fs::list_dir(ctx, require(bound, "path")?),
|
||||
HostFn::MakeDir => fs::make_dir(ctx, require(bound, "path")?),
|
||||
HostFn::Remove => fs::remove(ctx, require(bound, "path")?),
|
||||
HostFn::FsMakeDirs => fs::make_dirs(ctx, require(bound, "path")?),
|
||||
HostFn::FsRemoveTree => fs::remove_tree(ctx, require(bound, "path")?),
|
||||
HostFn::FsStat => fs::stat(ctx, require(bound, "path")?),
|
||||
HostFn::FsWalk => fs::walk(ctx, require(bound, "path")?),
|
||||
HostFn::NowUnix => time::now_unix(),
|
||||
HostFn::NowMs => time::now_ms(),
|
||||
HostFn::FormatTime => {
|
||||
@@ -1210,6 +1321,11 @@ pub fn call_host(
|
||||
HostFn::EncodingBase64Decode => encoding::base64_decode(require(bound, "text")?),
|
||||
HostFn::EncodingHexEncode => encoding::hex_encode(require(bound, "text")?),
|
||||
HostFn::EncodingHexDecode => encoding::hex_decode(require(bound, "text")?),
|
||||
HostFn::EncodingBase32Encode => encoding::base32_encode(require(bound, "text")?),
|
||||
HostFn::EncodingBase32Decode => encoding::base32_decode(require(bound, "text")?),
|
||||
HostFn::TomlParse => toml_ops::parse(require(bound, "text")?),
|
||||
HostFn::HtmlEscape => html_ops::escape(require(bound, "text")?),
|
||||
HostFn::HtmlUnescape => html_ops::unescape(require(bound, "text")?),
|
||||
HostFn::PathJoin => path::join(require(bound, "a")?, require(bound, "b")?),
|
||||
HostFn::PathSplit => path::split(require(bound, "path")?),
|
||||
HostFn::PathFileName => path::file_name(require(bound, "path")?),
|
||||
@@ -1270,8 +1386,36 @@ pub fn call_host(
|
||||
HostFn::ListFlatten => super::collection::list_flatten(require(bound, "list")?),
|
||||
HostFn::CliParse => cli::parse(ctx, bound.get("args")),
|
||||
HostFn::LogSetLevel => log::set_level(ctx, require(bound, "level")?),
|
||||
HostFn::LogLine => log::line(ctx, require(bound, "level")?, require(bound, "text")?),
|
||||
HostFn::LogLine => log::line(
|
||||
ctx,
|
||||
require(bound, "level")?,
|
||||
require(bound, "text")?,
|
||||
bound.get("fields"),
|
||||
),
|
||||
HostFn::StatsMean => stats::mean(require(bound, "list")?),
|
||||
HostFn::StatsMedian => stats::median(require(bound, "list")?),
|
||||
HostFn::StatsStdev => stats::stdev(require(bound, "list")?),
|
||||
HostFn::UuidV4 => uuid_ops::v4(),
|
||||
HostFn::DatetimeNow => datetime::now(),
|
||||
HostFn::DatetimeFromUnix => {
|
||||
datetime::from_unix(require(bound, "unix")?, bound.get("zone"))
|
||||
}
|
||||
HostFn::DatetimeToUnix => datetime::to_unix(require(bound, "dt")?),
|
||||
HostFn::DatetimeParse => datetime::parse(require(bound, "text")?, bound.get("pattern")),
|
||||
HostFn::DatetimeFormat => datetime::format(require(bound, "dt")?, bound.get("style")),
|
||||
HostFn::DatetimeAdd => datetime::add(
|
||||
require(bound, "dt")?,
|
||||
bound.get("days"),
|
||||
bound.get("hours"),
|
||||
bound.get("minutes"),
|
||||
bound.get("seconds"),
|
||||
),
|
||||
HostFn::DatetimeInZone => {
|
||||
datetime::in_zone(require(bound, "dt")?, require(bound, "zone")?)
|
||||
}
|
||||
HostFn::UrlParse => url_ops::parse(require(bound, "text")?),
|
||||
HostFn::UrlQueryParse => url_ops::query_parse(require(bound, "text")?),
|
||||
HostFn::UrlQueryStringify => url_ops::query_stringify(require(bound, "map")?),
|
||||
HostFn::OuterCallLine => Ok(Value::Int(
|
||||
ctx.call_site_lines
|
||||
.first()
|
||||
|
||||
@@ -53,6 +53,74 @@ pub fn hex_decode(text: &Value) -> Result<Value, String> {
|
||||
Ok(Value::Text(out))
|
||||
}
|
||||
|
||||
const B32: &[u8] = b"ABCDEFGHIJKLMNOPQRSTUVWXYZ234567";
|
||||
|
||||
pub fn base32_encode(text: &Value) -> Result<Value, String> {
|
||||
let s = as_text(text, "text")?;
|
||||
Ok(Value::Text(encode_base32(s.as_bytes())))
|
||||
}
|
||||
|
||||
pub fn base32_decode(text: &Value) -> Result<Value, String> {
|
||||
let s = as_text(text, "text")?;
|
||||
let bytes = decode_base32(s)?;
|
||||
let out = String::from_utf8(bytes).map_err(|e| format!("base32_decode: invalid utf-8: {e}"))?;
|
||||
Ok(Value::Text(out))
|
||||
}
|
||||
|
||||
fn encode_base32(input: &[u8]) -> String {
|
||||
let mut out = String::new();
|
||||
let mut buffer: u64 = 0;
|
||||
let mut bits = 0u32;
|
||||
for &b in input {
|
||||
buffer = (buffer << 8) | (b as u64);
|
||||
bits += 8;
|
||||
while bits >= 5 {
|
||||
bits -= 5;
|
||||
let idx = ((buffer >> bits) & 31) as usize;
|
||||
out.push(B32[idx] as char);
|
||||
}
|
||||
}
|
||||
if bits > 0 {
|
||||
let idx = ((buffer << (5 - bits)) & 31) as usize;
|
||||
out.push(B32[idx] as char);
|
||||
}
|
||||
while out.len() % 8 != 0 {
|
||||
out.push('=');
|
||||
}
|
||||
out
|
||||
}
|
||||
|
||||
fn decode_base32(input: &str) -> Result<Vec<u8>, String> {
|
||||
let cleaned: String = input
|
||||
.chars()
|
||||
.filter(|c| !c.is_whitespace())
|
||||
.map(|c| c.to_ascii_uppercase())
|
||||
.collect();
|
||||
if cleaned.len() % 8 != 0 {
|
||||
return Err("base32_decode: length must be multiple of 8".into());
|
||||
}
|
||||
let mut out = Vec::new();
|
||||
let mut buffer: u64 = 0;
|
||||
let mut bits = 0u32;
|
||||
for c in cleaned.bytes() {
|
||||
if c == b'=' {
|
||||
break;
|
||||
}
|
||||
let v = match c {
|
||||
b'A'..=b'Z' => c - b'A',
|
||||
b'2'..=b'7' => c - b'2' + 26,
|
||||
_ => return Err(format!("base32_decode: invalid character {:?}", c as char)),
|
||||
} as u64;
|
||||
buffer = (buffer << 5) | v;
|
||||
bits += 5;
|
||||
if bits >= 8 {
|
||||
bits -= 8;
|
||||
out.push(((buffer >> bits) & 0xff) as u8);
|
||||
}
|
||||
}
|
||||
Ok(out)
|
||||
}
|
||||
|
||||
fn from_hex(b: u8) -> Result<u8, String> {
|
||||
match b {
|
||||
b'0'..=b'9' => Ok(b - b'0'),
|
||||
@@ -153,5 +221,8 @@ mod tests {
|
||||
let hx = hex_encode(&Value::Text("hi".into())).unwrap();
|
||||
assert_eq!(hx, Value::Text("6869".into()));
|
||||
assert_eq!(hex_decode(&hx).unwrap(), Value::Text("hi".into()));
|
||||
let b32 = base32_encode(&Value::Text("hello".into())).unwrap();
|
||||
assert_eq!(b32, Value::Text("NBSWY3DP".into()));
|
||||
assert_eq!(base32_decode(&b32).unwrap(), Value::Text("hello".into()));
|
||||
}
|
||||
}
|
||||
@@ -94,6 +94,16 @@ pub fn make_dir(ctx: &HostContext, path: &Value) -> Result<Value, String> {
|
||||
Ok(Value::None)
|
||||
}
|
||||
|
||||
/// Explicit recursive mkdir (same host behavior as `make_dir`).
|
||||
pub fn make_dirs(ctx: &HostContext, path: &Value) -> Result<Value, String> {
|
||||
if !ctx.allow_fs_write() {
|
||||
return Err("make_dirs denied by host policy".into());
|
||||
}
|
||||
let p = ctx.resolve_path(text_path(path)?)?;
|
||||
fs::create_dir_all(&p).map_err(|e| format!("make_dirs {}: {e}", p.display()))?;
|
||||
Ok(Value::None)
|
||||
}
|
||||
|
||||
pub fn remove(ctx: &HostContext, path: &Value) -> Result<Value, String> {
|
||||
if !ctx.allow_fs_write() {
|
||||
return Err("remove denied by host policy".into());
|
||||
@@ -107,6 +117,80 @@ pub fn remove(ctx: &HostContext, path: &Value) -> Result<Value, String> {
|
||||
Ok(Value::None)
|
||||
}
|
||||
|
||||
/// Remove a directory tree. Errors if `path` is a file.
|
||||
pub fn remove_tree(ctx: &HostContext, path: &Value) -> Result<Value, String> {
|
||||
if !ctx.allow_fs_write() {
|
||||
return Err("remove_tree denied by host policy".into());
|
||||
}
|
||||
let p = ctx.resolve_path(text_path(path)?)?;
|
||||
if !p.exists() {
|
||||
return Err(format!("remove_tree: not found: {}", p.display()));
|
||||
}
|
||||
if !p.is_dir() {
|
||||
return Err(format!("remove_tree: not a directory: {}", p.display()));
|
||||
}
|
||||
fs::remove_dir_all(&p).map_err(|e| format!("remove_tree {}: {e}", p.display()))?;
|
||||
Ok(Value::None)
|
||||
}
|
||||
|
||||
/// `{size, mtime_unix, is_file, is_dir}` for a path.
|
||||
pub fn stat(ctx: &HostContext, path: &Value) -> Result<Value, String> {
|
||||
let p = ctx.resolve_path(text_path(path)?)?;
|
||||
let meta = fs::metadata(&p).map_err(|e| format!("stat {}: {e}", p.display()))?;
|
||||
let mtime = meta
|
||||
.modified()
|
||||
.ok()
|
||||
.and_then(|t| t.duration_since(std::time::UNIX_EPOCH).ok())
|
||||
.map(|d| d.as_secs() as i64)
|
||||
.unwrap_or(0);
|
||||
Ok(Value::Map(vec![
|
||||
("size".into(), Value::Int(meta.len() as i64)),
|
||||
("mtime_unix".into(), Value::Int(mtime)),
|
||||
("is_file".into(), Value::Bool(meta.is_file())),
|
||||
("is_dir".into(), Value::Bool(meta.is_dir())),
|
||||
]))
|
||||
}
|
||||
|
||||
/// Depth-first walk; returns path texts relative to `path` (forward slashes), sorted per directory.
|
||||
pub fn walk(ctx: &HostContext, path: &Value) -> Result<Value, String> {
|
||||
let root = ctx.resolve_path(text_path(path)?)?;
|
||||
if !root.is_dir() {
|
||||
return Err(format!("walk: not a directory: {}", root.display()));
|
||||
}
|
||||
let mut out: Vec<Value> = Vec::new();
|
||||
walk_dfs(&root, Path::new(""), &mut out)?;
|
||||
Ok(Value::List(out))
|
||||
}
|
||||
|
||||
fn walk_dfs(abs: &Path, rel: &Path, out: &mut Vec<Value>) -> Result<(), String> {
|
||||
let mut entries: Vec<_> = fs::read_dir(abs)
|
||||
.map_err(|e| format!("walk {}: {e}", abs.display()))?
|
||||
.collect::<Result<Vec<_>, _>>()
|
||||
.map_err(|e| format!("walk: {e}"))?;
|
||||
entries.sort_by_key(|e| e.file_name());
|
||||
for ent in entries {
|
||||
let name = ent.file_name();
|
||||
let child_rel = if rel.as_os_str().is_empty() {
|
||||
Path::new(&name).to_path_buf()
|
||||
} else {
|
||||
rel.join(&name)
|
||||
};
|
||||
let rel_text = child_rel
|
||||
.components()
|
||||
.map(|c| c.as_os_str().to_string_lossy())
|
||||
.collect::<Vec<_>>()
|
||||
.join("/");
|
||||
out.push(Value::Text(rel_text));
|
||||
let ft = ent
|
||||
.file_type()
|
||||
.map_err(|e| format!("walk file_type: {e}"))?;
|
||||
if ft.is_dir() {
|
||||
walk_dfs(&ent.path(), &child_rel, out)?;
|
||||
}
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
|
||||
pub fn copy_file(ctx: &HostContext, src: &Value, dest: &Value) -> Result<Value, String> {
|
||||
if !ctx.allow_fs_write() {
|
||||
return Err("copy_file denied by host policy".into());
|
||||
|
||||
@@ -0,0 +1,71 @@
|
||||
//! HTML escape / unescape for Mid2 M8 (`lib/html`).
|
||||
|
||||
use crate::value::Value;
|
||||
|
||||
fn as_text<'a>(v: &'a Value, label: &str) -> Result<&'a str, String> {
|
||||
match v {
|
||||
Value::Text(s) => Ok(s.as_str()),
|
||||
_ => Err(format!("{label} must be text")),
|
||||
}
|
||||
}
|
||||
|
||||
pub fn escape(text: &Value) -> Result<Value, String> {
|
||||
let s = as_text(text, "text")?;
|
||||
let mut out = String::with_capacity(s.len());
|
||||
for c in s.chars() {
|
||||
match c {
|
||||
'&' => out.push_str("&"),
|
||||
'<' => out.push_str("<"),
|
||||
'>' => out.push_str(">"),
|
||||
'"' => out.push_str("""),
|
||||
'\'' => out.push_str("'"),
|
||||
_ => out.push(c),
|
||||
}
|
||||
}
|
||||
Ok(Value::Text(out))
|
||||
}
|
||||
|
||||
pub fn unescape(text: &Value) -> Result<Value, String> {
|
||||
let s = as_text(text, "text")?;
|
||||
let mut out = String::with_capacity(s.len());
|
||||
let mut rest = s;
|
||||
while let Some(i) = rest.find('&') {
|
||||
out.push_str(&rest[..i]);
|
||||
rest = &rest[i..];
|
||||
if let Some(end) = rest.find(';') {
|
||||
let ent = &rest[..=end];
|
||||
let ch = match ent {
|
||||
"&" => Some('&'),
|
||||
"<" => Some('<'),
|
||||
">" => Some('>'),
|
||||
""" => Some('"'),
|
||||
"'" | "'" | "'" => Some('\''),
|
||||
_ => None,
|
||||
};
|
||||
if let Some(c) = ch {
|
||||
out.push(c);
|
||||
rest = &rest[end + 1..];
|
||||
continue;
|
||||
}
|
||||
}
|
||||
out.push('&');
|
||||
rest = &rest[1..];
|
||||
}
|
||||
out.push_str(rest);
|
||||
Ok(Value::Text(out))
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
|
||||
#[test]
|
||||
fn roundtrip() {
|
||||
let e = escape(&Value::Text(r#"a<b>&"c'"#.into())).unwrap();
|
||||
assert_eq!(
|
||||
e,
|
||||
Value::Text("a<b>&"c'".into())
|
||||
);
|
||||
assert_eq!(unescape(&e).unwrap(), Value::Text(r#"a<b>&"c'"#.into()));
|
||||
}
|
||||
}
|
||||
+34
-2
@@ -46,13 +46,32 @@ pub fn set_level(ctx: &mut HostContext, level: &Value) -> Result<Value, String>
|
||||
}
|
||||
|
||||
/// Return a ready-to-print line, or `None` if filtered out.
|
||||
pub fn line(ctx: &HostContext, level: &Value, text: &Value) -> Result<Value, String> {
|
||||
/// Optional `fields` map is appended as `key=value` pairs (stable map order).
|
||||
pub fn line(
|
||||
ctx: &HostContext,
|
||||
level: &Value,
|
||||
text: &Value,
|
||||
fields: Option<&Value>,
|
||||
) -> Result<Value, String> {
|
||||
let lvl = Level::parse(as_text(level, "level")?)?;
|
||||
let msg = as_text(text, "text")?;
|
||||
if (lvl as u8) < ctx.log_min_level {
|
||||
return Ok(Value::None);
|
||||
}
|
||||
Ok(Value::Text(format!("{} {}", lvl.label(), msg)))
|
||||
let mut out = format!("{} {}", lvl.label(), msg);
|
||||
match fields {
|
||||
None | Some(Value::None) => {}
|
||||
Some(Value::Map(entries)) => {
|
||||
for (k, v) in entries {
|
||||
out.push(' ');
|
||||
out.push_str(k);
|
||||
out.push('=');
|
||||
out.push_str(&v.as_display());
|
||||
}
|
||||
}
|
||||
Some(_) => return Err("log: fields must be a map".into()),
|
||||
}
|
||||
Ok(Value::Text(out))
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
@@ -67,6 +86,7 @@ mod tests {
|
||||
&ctx,
|
||||
&Value::Text("debug".into()),
|
||||
&Value::Text("x".into()),
|
||||
None,
|
||||
)
|
||||
.unwrap();
|
||||
assert_eq!(filtered, Value::None);
|
||||
@@ -75,8 +95,20 @@ mod tests {
|
||||
&ctx,
|
||||
&Value::Text("debug".into()),
|
||||
&Value::Text("x".into()),
|
||||
None,
|
||||
)
|
||||
.unwrap();
|
||||
assert_eq!(shown, Value::Text("DEBUG x".into()));
|
||||
let with = line(
|
||||
&ctx,
|
||||
&Value::Text("info".into()),
|
||||
&Value::Text("hi".into()),
|
||||
Some(&Value::Map(vec![
|
||||
("user".into(), Value::Text("a".into())),
|
||||
("n".into(), Value::Int(1)),
|
||||
])),
|
||||
)
|
||||
.unwrap();
|
||||
assert_eq!(with, Value::Text("INFO hi user=a n=1".into()));
|
||||
}
|
||||
}
|
||||
+6
-1
@@ -9,12 +9,14 @@ pub mod collection;
|
||||
mod dispatch;
|
||||
mod cli;
|
||||
mod csv;
|
||||
mod datetime;
|
||||
mod encoding;
|
||||
pub mod event_bus;
|
||||
#[cfg(feature = "exec-host")]
|
||||
pub mod foreign;
|
||||
mod fs;
|
||||
mod hash;
|
||||
mod html_ops;
|
||||
pub(crate) mod json;
|
||||
mod log;
|
||||
pub mod math;
|
||||
@@ -22,7 +24,11 @@ mod net;
|
||||
mod path;
|
||||
mod re;
|
||||
mod secrets;
|
||||
mod stats;
|
||||
mod text_ops;
|
||||
mod time;
|
||||
mod toml_ops;
|
||||
mod url_ops;
|
||||
mod uuid_ops;
|
||||
#[cfg(feature = "plugin-host")]
|
||||
pub mod plugin;
|
||||
@@ -35,7 +41,6 @@ pub mod subtask;
|
||||
#[path = "subtask_stub.rs"]
|
||||
pub mod subtask;
|
||||
mod sys;
|
||||
mod time;
|
||||
pub mod writeback;
|
||||
|
||||
pub use dispatch::{call_host, HostFn};
|
||||
|
||||
+14
-5
@@ -571,17 +571,26 @@ pub fn call_registered(
|
||||
let mut out_ptr: *mut c_char = std::ptr::null_mut();
|
||||
let mut err_ptr: *mut c_char = std::ptr::null_mut();
|
||||
|
||||
CURRENT_HOST.with(|c| c.set(ctx as *mut HostContext));
|
||||
{
|
||||
// Nesting-safe: restore previous host pointers after this call. Clearing to
|
||||
// null would break a long-lived outer call (e.g. `web_listen`) so later
|
||||
// HTTP `invoke` / `host_query` on worker threads see no active context.
|
||||
let prev_tls = CURRENT_HOST.with(|c| {
|
||||
let prev = c.get();
|
||||
c.set(ctx as *mut HostContext);
|
||||
prev
|
||||
});
|
||||
let prev_global = {
|
||||
let mut g = global_host_slot().lock().unwrap_or_else(|e| e.into_inner());
|
||||
let prev = g.0;
|
||||
g.0 = ctx as *mut HostContext;
|
||||
}
|
||||
prev
|
||||
};
|
||||
let rc = unsafe { (reg.fn_ptr)(c_args.as_ptr(), &mut out_ptr, &mut err_ptr) };
|
||||
{
|
||||
let mut g = global_host_slot().lock().unwrap_or_else(|e| e.into_inner());
|
||||
g.0 = std::ptr::null_mut();
|
||||
g.0 = prev_global;
|
||||
}
|
||||
CURRENT_HOST.with(|c| c.set(std::ptr::null_mut()));
|
||||
CURRENT_HOST.with(|c| c.set(prev_tls));
|
||||
|
||||
let err_s = take_c_string(err_ptr);
|
||||
let out_s = take_c_string(out_ptr);
|
||||
|
||||
@@ -0,0 +1,87 @@
|
||||
//! Thin statistics for Mid2 M10 (`lib/stats`). Not a dataframe library.
|
||||
|
||||
use crate::value::Value;
|
||||
|
||||
fn as_nums(list: &Value) -> Result<Vec<f64>, String> {
|
||||
let Value::List(xs) = list else {
|
||||
return Err("stats: list of numbers required".into());
|
||||
};
|
||||
let mut out = Vec::with_capacity(xs.len());
|
||||
for (i, x) in xs.iter().enumerate() {
|
||||
match x {
|
||||
Value::Int(n) => out.push(*n as f64),
|
||||
Value::Num(n) => out.push(*n),
|
||||
_ => return Err(format!("stats: item {i} must be number")),
|
||||
}
|
||||
}
|
||||
Ok(out)
|
||||
}
|
||||
|
||||
fn num_val(n: f64) -> Value {
|
||||
if n.fract() == 0.0 && n.abs() < (i64::MAX as f64) {
|
||||
Value::Int(n as i64)
|
||||
} else {
|
||||
Value::Num(n)
|
||||
}
|
||||
}
|
||||
|
||||
pub fn mean(list: &Value) -> Result<Value, String> {
|
||||
let xs = as_nums(list)?;
|
||||
if xs.is_empty() {
|
||||
return Err("stats.mean: empty list".into());
|
||||
}
|
||||
let sum: f64 = xs.iter().sum();
|
||||
Ok(Value::Num(sum / xs.len() as f64))
|
||||
}
|
||||
|
||||
pub fn median(list: &Value) -> Result<Value, String> {
|
||||
let mut xs = as_nums(list)?;
|
||||
if xs.is_empty() {
|
||||
return Err("stats.median: empty list".into());
|
||||
}
|
||||
xs.sort_by(|a, b| a.partial_cmp(b).unwrap());
|
||||
let n = xs.len();
|
||||
let m = if n % 2 == 1 {
|
||||
xs[n / 2]
|
||||
} else {
|
||||
(xs[n / 2 - 1] + xs[n / 2]) / 2.0
|
||||
};
|
||||
Ok(num_val(m))
|
||||
}
|
||||
|
||||
/// Sample standard deviation (n >= 2), matching common `stdev` semantics.
|
||||
pub fn stdev(list: &Value) -> Result<Value, String> {
|
||||
let xs = as_nums(list)?;
|
||||
if xs.len() < 2 {
|
||||
return Err("stats.stdev: need at least 2 values".into());
|
||||
}
|
||||
let n = xs.len() as f64;
|
||||
let mean = xs.iter().sum::<f64>() / n;
|
||||
let var = xs.iter().map(|x| {
|
||||
let d = x - mean;
|
||||
d * d
|
||||
}).sum::<f64>()
|
||||
/ (n - 1.0);
|
||||
Ok(Value::Num(var.sqrt()))
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
|
||||
#[test]
|
||||
fn basic() {
|
||||
let xs = Value::List(vec![
|
||||
Value::Int(1),
|
||||
Value::Int(2),
|
||||
Value::Int(3),
|
||||
Value::Int(4),
|
||||
]);
|
||||
let m = mean(&xs).unwrap();
|
||||
assert_eq!(m, Value::Num(2.5));
|
||||
assert_eq!(median(&xs).unwrap(), Value::Num(2.5));
|
||||
let s = stdev(&xs).unwrap();
|
||||
let Value::Num(v) = s else { panic!() };
|
||||
assert!((v - 1.2909944487358056).abs() < 1e-9);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,340 @@
|
||||
//! Minimal TOML → Marqdo Value for Mid2 M8 (`lib/toml`).
|
||||
//! Subset: comments, keys, strings, ints, floats, bools, arrays of scalars,
|
||||
//! `[table]` / dotted tables. No datetime, inline tables, or array-of-tables.
|
||||
|
||||
use crate::host::json::json_to_value;
|
||||
use crate::value::Value;
|
||||
|
||||
fn as_text<'a>(v: &'a Value, label: &str) -> Result<&'a str, String> {
|
||||
match v {
|
||||
Value::Text(s) => Ok(s.as_str()),
|
||||
_ => Err(format!("{label} must be text")),
|
||||
}
|
||||
}
|
||||
|
||||
pub fn parse(text: &Value) -> Result<Value, String> {
|
||||
let raw = as_text(text, "text")?;
|
||||
let json = toml_to_json(raw)?;
|
||||
json_to_value(&json)
|
||||
}
|
||||
|
||||
fn toml_to_json(src: &str) -> Result<serde_json::Value, String> {
|
||||
let mut root = serde_json::Map::new();
|
||||
let mut current_path: Vec<String> = Vec::new();
|
||||
for (lineno, line) in src.lines().enumerate() {
|
||||
let line_no = lineno + 1;
|
||||
let stripped = strip_comment(line);
|
||||
let t = stripped.trim();
|
||||
if t.is_empty() {
|
||||
continue;
|
||||
}
|
||||
if t.starts_with('[') {
|
||||
if !t.ends_with(']') {
|
||||
return Err(format!("toml.parse:{line_no}: bad table header"));
|
||||
}
|
||||
if t.starts_with("[[") {
|
||||
return Err(format!(
|
||||
"toml.parse:{line_no}: array-of-tables [[...]] not supported"
|
||||
));
|
||||
}
|
||||
let inner = t[1..t.len() - 1].trim();
|
||||
current_path = split_dotted_keys(inner, line_no)?;
|
||||
ensure_table_path(&mut root, ¤t_path, line_no)?;
|
||||
continue;
|
||||
}
|
||||
let (key, val) = t
|
||||
.split_once('=')
|
||||
.ok_or_else(|| format!("toml.parse:{line_no}: expected key = value"))?;
|
||||
let key = key.trim();
|
||||
if key.is_empty() {
|
||||
return Err(format!("toml.parse:{line_no}: empty key"));
|
||||
}
|
||||
let key_parts = split_dotted_keys(key, line_no)?;
|
||||
let value = parse_value(val.trim(), line_no)?;
|
||||
let parent = table_at_path(&mut root, ¤t_path, line_no)?;
|
||||
insert_dotted(parent, &key_parts, value, line_no)?;
|
||||
}
|
||||
Ok(serde_json::Value::Object(root))
|
||||
}
|
||||
|
||||
fn strip_comment(line: &str) -> String {
|
||||
// Strip unquoted `#` comments.
|
||||
let mut out = String::new();
|
||||
let mut in_str = false;
|
||||
let mut chars = line.chars().peekable();
|
||||
while let Some(c) = chars.next() {
|
||||
if !in_str && c == '#' {
|
||||
break;
|
||||
}
|
||||
if c == '"' {
|
||||
out.push(c);
|
||||
in_str = !in_str;
|
||||
continue;
|
||||
}
|
||||
if in_str && c == '\\' {
|
||||
out.push(c);
|
||||
if let Some(n) = chars.next() {
|
||||
out.push(n);
|
||||
}
|
||||
continue;
|
||||
}
|
||||
out.push(c);
|
||||
}
|
||||
out
|
||||
}
|
||||
|
||||
fn split_dotted_keys(s: &str, line_no: usize) -> Result<Vec<String>, String> {
|
||||
let mut parts = Vec::new();
|
||||
let mut cur = String::new();
|
||||
let mut in_quote = false;
|
||||
let mut chars = s.chars().peekable();
|
||||
while let Some(c) = chars.next() {
|
||||
if c == '"' {
|
||||
in_quote = !in_quote;
|
||||
continue;
|
||||
}
|
||||
if c == '.' && !in_quote {
|
||||
if cur.is_empty() {
|
||||
return Err(format!("toml.parse:{line_no}: empty key segment"));
|
||||
}
|
||||
parts.push(std::mem::take(&mut cur));
|
||||
continue;
|
||||
}
|
||||
cur.push(c);
|
||||
}
|
||||
if in_quote {
|
||||
return Err(format!("toml.parse:{line_no}: unclosed quoted key"));
|
||||
}
|
||||
if !cur.is_empty() {
|
||||
parts.push(cur);
|
||||
}
|
||||
if parts.is_empty() {
|
||||
return Err(format!("toml.parse:{line_no}: empty path"));
|
||||
}
|
||||
Ok(parts)
|
||||
}
|
||||
|
||||
fn ensure_table_path(
|
||||
root: &mut serde_json::Map<String, serde_json::Value>,
|
||||
path: &[String],
|
||||
line_no: usize,
|
||||
) -> Result<(), String> {
|
||||
let mut cur = root;
|
||||
for seg in path {
|
||||
if !cur.contains_key(seg) {
|
||||
cur.insert(seg.clone(), serde_json::Value::Object(serde_json::Map::new()));
|
||||
}
|
||||
cur = match cur.get_mut(seg) {
|
||||
Some(serde_json::Value::Object(m)) => m,
|
||||
Some(_) => {
|
||||
return Err(format!("toml.parse:{line_no}: {seg} is not a table"));
|
||||
}
|
||||
None => unreachable!(),
|
||||
};
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
|
||||
fn table_at_path<'a>(
|
||||
root: &'a mut serde_json::Map<String, serde_json::Value>,
|
||||
path: &[String],
|
||||
line_no: usize,
|
||||
) -> Result<&'a mut serde_json::Map<String, serde_json::Value>, String> {
|
||||
let mut cur = root;
|
||||
for seg in path {
|
||||
cur = match cur.get_mut(seg) {
|
||||
Some(serde_json::Value::Object(m)) => m,
|
||||
Some(_) => {
|
||||
return Err(format!("toml.parse:{line_no}: {seg} is not a table"));
|
||||
}
|
||||
None => {
|
||||
return Err(format!("toml.parse:{line_no}: missing table {seg}"));
|
||||
}
|
||||
};
|
||||
}
|
||||
Ok(cur)
|
||||
}
|
||||
|
||||
fn insert_dotted(
|
||||
parent: &mut serde_json::Map<String, serde_json::Value>,
|
||||
parts: &[String],
|
||||
value: serde_json::Value,
|
||||
line_no: usize,
|
||||
) -> Result<(), String> {
|
||||
if parts.len() == 1 {
|
||||
if parent.contains_key(&parts[0]) {
|
||||
return Err(format!(
|
||||
"toml.parse:{line_no}: duplicate key {}",
|
||||
parts[0]
|
||||
));
|
||||
}
|
||||
parent.insert(parts[0].clone(), value);
|
||||
return Ok(());
|
||||
}
|
||||
let head = &parts[0];
|
||||
let entry = parent
|
||||
.entry(head.clone())
|
||||
.or_insert_with(|| serde_json::Value::Object(serde_json::Map::new()));
|
||||
let obj = match entry {
|
||||
serde_json::Value::Object(m) => m,
|
||||
_ => {
|
||||
return Err(format!("toml.parse:{line_no}: {head} is not a table"));
|
||||
}
|
||||
};
|
||||
insert_dotted(obj, &parts[1..], value, line_no)
|
||||
}
|
||||
|
||||
fn parse_value(s: &str, line_no: usize) -> Result<serde_json::Value, String> {
|
||||
if s.is_empty() {
|
||||
return Err(format!("toml.parse:{line_no}: empty value"));
|
||||
}
|
||||
if s == "true" {
|
||||
return Ok(serde_json::Value::Bool(true));
|
||||
}
|
||||
if s == "false" {
|
||||
return Ok(serde_json::Value::Bool(false));
|
||||
}
|
||||
if s.starts_with('"') {
|
||||
return Ok(serde_json::Value::String(parse_basic_string(s, line_no)?));
|
||||
}
|
||||
if s.starts_with('\'') {
|
||||
return Ok(serde_json::Value::String(parse_literal_string(s, line_no)?));
|
||||
}
|
||||
if s.starts_with('[') {
|
||||
return parse_array(s, line_no);
|
||||
}
|
||||
if let Ok(i) = s.replace('_', "").parse::<i64>() {
|
||||
return Ok(serde_json::Value::Number(i.into()));
|
||||
}
|
||||
if let Ok(f) = s.replace('_', "").parse::<f64>() {
|
||||
if let Some(n) = serde_json::Number::from_f64(f) {
|
||||
return Ok(serde_json::Value::Number(n));
|
||||
}
|
||||
}
|
||||
Err(format!("toml.parse:{line_no}: unsupported value {s:?}"))
|
||||
}
|
||||
|
||||
fn parse_basic_string(s: &str, line_no: usize) -> Result<String, String> {
|
||||
if !s.ends_with('"') || s.len() < 2 {
|
||||
return Err(format!("toml.parse:{line_no}: bad string"));
|
||||
}
|
||||
let inner = &s[1..s.len() - 1];
|
||||
let mut out = String::new();
|
||||
let mut chars = inner.chars();
|
||||
while let Some(c) = chars.next() {
|
||||
if c == '\\' {
|
||||
match chars.next() {
|
||||
Some('n') => out.push('\n'),
|
||||
Some('t') => out.push('\t'),
|
||||
Some('r') => out.push('\r'),
|
||||
Some('\\') => out.push('\\'),
|
||||
Some('"') => out.push('"'),
|
||||
Some(other) => {
|
||||
return Err(format!(
|
||||
"toml.parse:{line_no}: bad escape \\{other}"
|
||||
));
|
||||
}
|
||||
None => return Err(format!("toml.parse:{line_no}: trailing escape")),
|
||||
}
|
||||
} else {
|
||||
out.push(c);
|
||||
}
|
||||
}
|
||||
Ok(out)
|
||||
}
|
||||
|
||||
fn parse_literal_string(s: &str, line_no: usize) -> Result<String, String> {
|
||||
if !s.ends_with('\'') || s.len() < 2 {
|
||||
return Err(format!("toml.parse:{line_no}: bad literal string"));
|
||||
}
|
||||
Ok(s[1..s.len() - 1].to_string())
|
||||
}
|
||||
|
||||
fn parse_array(s: &str, line_no: usize) -> Result<serde_json::Value, String> {
|
||||
if !s.ends_with(']') {
|
||||
return Err(format!("toml.parse:{line_no}: bad array"));
|
||||
}
|
||||
let inner = s[1..s.len() - 1].trim();
|
||||
if inner.is_empty() {
|
||||
return Ok(serde_json::Value::Array(vec![]));
|
||||
}
|
||||
let mut items = Vec::new();
|
||||
let mut cur = String::new();
|
||||
let mut depth = 0i32;
|
||||
let mut in_str = false;
|
||||
let mut str_ch = '"';
|
||||
let mut chars = inner.chars().peekable();
|
||||
while let Some(c) = chars.next() {
|
||||
if in_str {
|
||||
cur.push(c);
|
||||
if c == '\\' {
|
||||
if let Some(n) = chars.next() {
|
||||
cur.push(n);
|
||||
}
|
||||
continue;
|
||||
}
|
||||
if c == str_ch {
|
||||
in_str = false;
|
||||
}
|
||||
continue;
|
||||
}
|
||||
match c {
|
||||
'"' | '\'' => {
|
||||
in_str = true;
|
||||
str_ch = c;
|
||||
cur.push(c);
|
||||
}
|
||||
'[' => {
|
||||
depth += 1;
|
||||
cur.push(c);
|
||||
}
|
||||
']' => {
|
||||
depth -= 1;
|
||||
cur.push(c);
|
||||
}
|
||||
',' if depth == 0 => {
|
||||
items.push(parse_value(cur.trim(), line_no)?);
|
||||
cur.clear();
|
||||
}
|
||||
_ => cur.push(c),
|
||||
}
|
||||
}
|
||||
if !cur.trim().is_empty() {
|
||||
items.push(parse_value(cur.trim(), line_no)?);
|
||||
}
|
||||
Ok(serde_json::Value::Array(items))
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
|
||||
#[test]
|
||||
fn parse_simple() {
|
||||
let t = r#"
|
||||
# comment
|
||||
name = "marqdo"
|
||||
count = 3
|
||||
ok = true
|
||||
[pkg]
|
||||
version = "0.1"
|
||||
"#;
|
||||
let v = parse(&Value::Text(t.into())).unwrap();
|
||||
let Value::Map(entries) = v else { panic!() };
|
||||
let get = |k: &str| {
|
||||
entries
|
||||
.iter()
|
||||
.find(|(kk, _)| kk == k)
|
||||
.map(|(_, v)| v.clone())
|
||||
.unwrap()
|
||||
};
|
||||
assert_eq!(get("name"), Value::Text("marqdo".into()));
|
||||
assert_eq!(get("count"), Value::Int(3));
|
||||
assert_eq!(get("ok"), Value::Bool(true));
|
||||
let Value::Map(pkg) = get("pkg") else { panic!() };
|
||||
assert_eq!(
|
||||
pkg.iter().find(|(k, _)| k == "version").unwrap().1,
|
||||
Value::Text("0.1".into())
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,254 @@
|
||||
//! URL parse / query helpers for Mid2 M7 (`lib/url`).
|
||||
//! Distinct from `net::url_encode` (single-segment form encoding).
|
||||
//! Hand-rolled subset (no `url` crate): scheme://[userinfo@]host[:port]/path[?query][#frag].
|
||||
|
||||
use crate::value::Value;
|
||||
|
||||
fn as_text<'a>(v: &'a Value, label: &str) -> Result<&'a str, String> {
|
||||
match v {
|
||||
Value::Text(s) => Ok(s.as_str()),
|
||||
_ => Err(format!("{label} must be text")),
|
||||
}
|
||||
}
|
||||
|
||||
fn encode_component(s: &str) -> String {
|
||||
let mut out = String::new();
|
||||
for b in s.bytes() {
|
||||
match b {
|
||||
b'A'..=b'Z' | b'a'..=b'z' | b'0'..=b'9' | b'-' | b'_' | b'.' | b'~' => {
|
||||
out.push(b as char);
|
||||
}
|
||||
_ => out.push_str(&format!("%{b:02X}")),
|
||||
}
|
||||
}
|
||||
out
|
||||
}
|
||||
|
||||
fn decode_component(s: &str) -> Result<String, String> {
|
||||
let bytes = s.as_bytes();
|
||||
let mut out = Vec::with_capacity(bytes.len());
|
||||
let mut i = 0;
|
||||
while i < bytes.len() {
|
||||
match bytes[i] {
|
||||
b'+' => {
|
||||
out.push(b' ');
|
||||
i += 1;
|
||||
}
|
||||
b'%' if i + 2 < bytes.len() => {
|
||||
let h = |c: u8| -> Result<u8, String> {
|
||||
match c {
|
||||
b'0'..=b'9' => Ok(c - b'0'),
|
||||
b'a'..=b'f' => Ok(c - b'a' + 10),
|
||||
b'A'..=b'F' => Ok(c - b'A' + 10),
|
||||
_ => Err(format!("bad percent escape in {s:?}")),
|
||||
}
|
||||
};
|
||||
let v = (h(bytes[i + 1])? << 4) | h(bytes[i + 2])?;
|
||||
out.push(v);
|
||||
i += 3;
|
||||
}
|
||||
b'%' => return Err(format!("truncated percent escape in {s:?}")),
|
||||
c => {
|
||||
out.push(c);
|
||||
i += 1;
|
||||
}
|
||||
}
|
||||
}
|
||||
String::from_utf8(out).map_err(|e| format!("url decode utf8: {e}"))
|
||||
}
|
||||
|
||||
/// Parse `scheme://[userinfo@]host[:port]/path[?query][#fragment]`.
|
||||
pub fn parse(text: &Value) -> Result<Value, String> {
|
||||
let raw = as_text(text, "text")?;
|
||||
let (scheme, rest) = raw
|
||||
.split_once("://")
|
||||
.ok_or_else(|| format!("url.parse: missing :// in {raw:?}"))?;
|
||||
if scheme.is_empty()
|
||||
|| !scheme
|
||||
.chars()
|
||||
.all(|c| c.is_ascii_alphanumeric() || c == '+' || c == '-' || c == '.')
|
||||
{
|
||||
return Err(format!("url.parse: bad scheme in {raw:?}"));
|
||||
}
|
||||
|
||||
let (before_frag, fragment) = match rest.split_once('#') {
|
||||
Some((a, b)) => (a, b),
|
||||
None => (rest, ""),
|
||||
};
|
||||
let (before_query, query) = match before_frag.split_once('?') {
|
||||
Some((a, b)) => (a, b),
|
||||
None => (before_frag, ""),
|
||||
};
|
||||
|
||||
let (authority, path) = if let Some(i) = before_query.find('/') {
|
||||
(&before_query[..i], &before_query[i..])
|
||||
} else {
|
||||
(before_query, "")
|
||||
};
|
||||
|
||||
let (userinfo, hostport) = if let Some((u, h)) = authority.rsplit_once('@') {
|
||||
(u, h)
|
||||
} else {
|
||||
("", authority)
|
||||
};
|
||||
|
||||
let (host, port) = if hostport.starts_with('[') {
|
||||
// IPv6 literal [addr]:port
|
||||
let end = hostport
|
||||
.find(']')
|
||||
.ok_or_else(|| format!("url.parse: bad IPv6 host in {raw:?}"))?;
|
||||
let host = &hostport[1..end];
|
||||
let rest = &hostport[end + 1..];
|
||||
if rest.is_empty() {
|
||||
(host, Value::None)
|
||||
} else if let Some(p) = rest.strip_prefix(':') {
|
||||
let n: i64 = p
|
||||
.parse()
|
||||
.map_err(|_| format!("url.parse: bad port in {raw:?}"))?;
|
||||
(host, Value::Int(n))
|
||||
} else {
|
||||
return Err(format!("url.parse: bad hostport in {raw:?}"));
|
||||
}
|
||||
} else if let Some((h, p)) = hostport.rsplit_once(':') {
|
||||
if p.chars().all(|c| c.is_ascii_digit()) && !p.is_empty() {
|
||||
let n: i64 = p
|
||||
.parse()
|
||||
.map_err(|_| format!("url.parse: bad port in {raw:?}"))?;
|
||||
(h, Value::Int(n))
|
||||
} else {
|
||||
(hostport, Value::None)
|
||||
}
|
||||
} else {
|
||||
(hostport, Value::None)
|
||||
};
|
||||
|
||||
let path = if path.is_empty() {
|
||||
"/".to_string()
|
||||
} else {
|
||||
path.to_string()
|
||||
};
|
||||
|
||||
Ok(Value::Map(vec![
|
||||
("scheme".into(), Value::Text(scheme.to_string())),
|
||||
("userinfo".into(), Value::Text(userinfo.to_string())),
|
||||
("host".into(), Value::Text(host.to_string())),
|
||||
("port".into(), port),
|
||||
("path".into(), Value::Text(path)),
|
||||
("query".into(), Value::Text(query.to_string())),
|
||||
("fragment".into(), Value::Text(fragment.to_string())),
|
||||
]))
|
||||
}
|
||||
|
||||
pub fn query_parse(text: &Value) -> Result<Value, String> {
|
||||
let raw = as_text(text, "text")?;
|
||||
let raw = raw.strip_prefix('?').unwrap_or(raw);
|
||||
let mut map: Vec<(String, Value)> = Vec::new();
|
||||
if raw.is_empty() {
|
||||
return Ok(Value::Map(map));
|
||||
}
|
||||
for pair in raw.split('&') {
|
||||
if pair.is_empty() {
|
||||
continue;
|
||||
}
|
||||
let (k, v) = match pair.split_once('=') {
|
||||
Some((k, v)) => (k, v),
|
||||
None => (pair, ""),
|
||||
};
|
||||
let key = decode_component(k)?;
|
||||
let val = Value::Text(decode_component(v)?);
|
||||
if let Some((_, slot)) = map.iter_mut().find(|(kk, _)| *kk == key) {
|
||||
match slot {
|
||||
Value::List(xs) => xs.push(val),
|
||||
other => {
|
||||
let prev = std::mem::replace(other, Value::None);
|
||||
*other = Value::List(vec![prev, val]);
|
||||
}
|
||||
}
|
||||
} else {
|
||||
map.push((key, val));
|
||||
}
|
||||
}
|
||||
Ok(Value::Map(map))
|
||||
}
|
||||
|
||||
pub fn query_stringify(map: &Value) -> Result<Value, String> {
|
||||
let entries = match map {
|
||||
Value::Map(m) => m,
|
||||
Value::None => return Ok(Value::Text(String::new())),
|
||||
_ => return Err("url.query_stringify: map required".into()),
|
||||
};
|
||||
let mut parts: Vec<String> = Vec::new();
|
||||
for (k, v) in entries {
|
||||
let key = encode_component(k);
|
||||
match v {
|
||||
Value::List(xs) => {
|
||||
for x in xs {
|
||||
match x {
|
||||
Value::Text(s) => {
|
||||
parts.push(format!("{key}={}", encode_component(s)));
|
||||
}
|
||||
Value::Int(n) => {
|
||||
parts.push(format!("{key}={}", encode_component(&n.to_string())));
|
||||
}
|
||||
Value::Bool(b) => {
|
||||
parts.push(format!("{key}={}", encode_component(&b.to_string())));
|
||||
}
|
||||
Value::None => parts.push(format!("{key}=")),
|
||||
_ => {
|
||||
return Err("url.query_stringify: list values must be scalar".into())
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
Value::Text(s) => parts.push(format!("{key}={}", encode_component(s))),
|
||||
Value::Int(n) => parts.push(format!("{key}={}", encode_component(&n.to_string()))),
|
||||
Value::Bool(b) => parts.push(format!("{key}={}", encode_component(&b.to_string()))),
|
||||
Value::None => parts.push(format!("{key}=")),
|
||||
_ => return Err("url.query_stringify: values must be scalar or list".into()),
|
||||
}
|
||||
}
|
||||
Ok(Value::Text(parts.join("&")))
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
|
||||
#[test]
|
||||
fn parse_https_query() {
|
||||
let m = parse(&Value::Text(
|
||||
"https://user:pass@example.com:8443/a/b?x=1&y=2#frag".into(),
|
||||
))
|
||||
.unwrap();
|
||||
let Value::Map(entries) = m else { panic!() };
|
||||
let get = |k: &str| {
|
||||
entries
|
||||
.iter()
|
||||
.find(|(kk, _)| kk == k)
|
||||
.map(|(_, v)| v.clone())
|
||||
.unwrap()
|
||||
};
|
||||
assert_eq!(get("scheme"), Value::Text("https".into()));
|
||||
assert_eq!(get("host"), Value::Text("example.com".into()));
|
||||
assert_eq!(get("port"), Value::Int(8443));
|
||||
assert_eq!(get("path"), Value::Text("/a/b".into()));
|
||||
assert_eq!(get("query"), Value::Text("x=1&y=2".into()));
|
||||
assert_eq!(get("fragment"), Value::Text("frag".into()));
|
||||
assert_eq!(get("userinfo"), Value::Text("user:pass".into()));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn query_roundtrip() {
|
||||
let q = query_parse(&Value::Text("a=1&b=hello%20w&a=2".into())).unwrap();
|
||||
let s = query_stringify(&q).unwrap();
|
||||
assert_eq!(s, Value::Text("a=1&a=2&b=hello%20w".into()));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn empty_path_becomes_slash() {
|
||||
let m = parse(&Value::Text("https://example.com".into())).unwrap();
|
||||
let Value::Map(entries) = m else { panic!() };
|
||||
let path = entries.iter().find(|(k, _)| k == "path").unwrap().1.clone();
|
||||
assert_eq!(path, Value::Text("/".into()));
|
||||
}
|
||||
}
|
||||
@@ -1,16 +1,23 @@
|
||||
---
|
||||
title: web hosting live helpers
|
||||
description: Tiny lib used by hosting live-server invoke route.
|
||||
description: Tiny lib used by hosting live-server invoke route (nested plugin call).
|
||||
import web:ext/web/web.mq.md
|
||||
---
|
||||
|
||||
## echo
|
||||
+ `msg`=""
|
||||
+ `payload`=None
|
||||
|
||||
Nested plugin call (`web.page`) while `app.listen` is the outer plugin frame —
|
||||
must not clear GLOBAL_HOST so a second HTTP invoke still works.
|
||||
|
||||
*pg = > web.page title=`msg`*
|
||||
*title = pg[^title]*
|
||||
|
||||
`out` =
|
||||
|
||||
| ok | msg |
|
||||
|----|-----|
|
||||
| true | `msg` |
|
||||
| ok | msg | title |
|
||||
|----|-----|-------|
|
||||
| true | `msg` | `title` |
|
||||
|
||||
**out**
|
||||
+101
-19
@@ -1181,6 +1181,83 @@ fn lib_log_uuid_zh_smoke() {
|
||||
assert_out("tests/lib/日志-标识-烟测.mq.md", "INFO 中文信息\n36");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn lib_datetime_smoke() {
|
||||
assert_out(
|
||||
"tests/lib/datetime-smoke.mq.md",
|
||||
"1970-01-01T00:00:00Z\n1970-01-01T08:00:00+08:00\n1577905445\n86400\n1970-01-01",
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn lib_datetime_smoke_zh() {
|
||||
assert_out(
|
||||
"tests/lib/日期时间-烟测.mq.md",
|
||||
"1970-01-01T00:00:00Z\n1970-01-01T08:00:00+08:00\n1577905445",
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn lib_url_smoke() {
|
||||
assert_out(
|
||||
"tests/lib/url-smoke.mq.md",
|
||||
"https\nexample.com\n8443\n/a/b\nx=1&y=2\nfrag\nhi x\n1\n2\na=1&a=2&b=hi%20x",
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn lib_url_smoke_zh() {
|
||||
assert_out(
|
||||
"tests/lib/地址-烟测.mq.md",
|
||||
"https\nexample.com\n/a\nx=1",
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn lib_toml_html_encoding_smoke() {
|
||||
assert_out(
|
||||
"tests/lib/toml-html-encoding-smoke.mq.md",
|
||||
"marqdo\n2\n1\na<b>&"c'\na<b>&\"c'\nNBSWY3DP\nhello",
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn lib_toml_html_encoding_smoke_zh() {
|
||||
assert_out(
|
||||
"tests/lib/配置表-超文本-编码-烟测.mq.md",
|
||||
"中文\nTrue\na<b>\nNBUQ====",
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn lib_fs_mid2_smoke() {
|
||||
assert_out(
|
||||
"tests/lib/fs-mid2-smoke.mq.md",
|
||||
"1\nTrue\nFalse\n3\na.txt\nnested\nnested/b.txt\nFalse",
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn lib_fs_mid2_smoke_zh() {
|
||||
assert_out("tests/lib/文件-mid2-烟测.mq.md", "True\n2\nFalse");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn lib_stats_log_smoke() {
|
||||
assert_out(
|
||||
"tests/lib/stats-log-smoke.mq.md",
|
||||
"2.5\n2.5\n1.2909944487\nINFO hi user=alice n=3",
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn lib_stats_log_smoke_zh() {
|
||||
assert_out(
|
||||
"tests/lib/统计-日志-烟测.mq.md",
|
||||
"3\nINFO 你好 谁=甲 n=1",
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn lib_re_smoke() {
|
||||
assert_out(
|
||||
@@ -2062,25 +2139,30 @@ fn ext_web_hosting_live() {
|
||||
"proxy sse body={body}"
|
||||
);
|
||||
|
||||
// Invoke: POST JSON → demo.echo
|
||||
let out = Command::new("curl")
|
||||
.args([
|
||||
"-s",
|
||||
"-X",
|
||||
"POST",
|
||||
&format!("{base}/api/echo"),
|
||||
"-H",
|
||||
"Content-Type: application/json",
|
||||
"-d",
|
||||
r#"{"msg":"hi"}"#,
|
||||
])
|
||||
.output()
|
||||
.expect("curl invoke");
|
||||
let body = String::from_utf8_lossy(&out.stdout);
|
||||
assert!(
|
||||
body.contains("\"ok\"") && body.contains("\"msg\":\"hi\""),
|
||||
"invoke body={body}"
|
||||
);
|
||||
// Invoke twice: demo.echo nests a web.page plugin call; the second request
|
||||
// must still see GLOBAL_HOST (listen outer frame) — regression for 0.3.7.
|
||||
for (msg, label) in [("hi", "first"), ("again", "second")] {
|
||||
let out = Command::new("curl")
|
||||
.args([
|
||||
"-s",
|
||||
"-X",
|
||||
"POST",
|
||||
&format!("{base}/api/echo"),
|
||||
"-H",
|
||||
"Content-Type: application/json",
|
||||
"-d",
|
||||
&format!(r#"{{"msg":"{msg}"}}"#),
|
||||
])
|
||||
.output()
|
||||
.expect("curl invoke");
|
||||
let body = String::from_utf8_lossy(&out.stdout);
|
||||
assert!(
|
||||
body.contains("\"ok\"")
|
||||
&& body.contains(&format!("\"msg\":\"{msg}\""))
|
||||
&& !body.contains("no active host context"),
|
||||
"invoke {label} body={body}"
|
||||
);
|
||||
}
|
||||
|
||||
let _ = child.kill();
|
||||
let _ = child.wait();
|
||||
|
||||
@@ -0,0 +1,23 @@
|
||||
---
|
||||
title: lib/datetime smoke
|
||||
import dt:lib/datetime.mq.md
|
||||
---
|
||||
|
||||
# main
|
||||
|
||||
*m = > dt.from_unix unix=0*
|
||||
> print text=`m`[^iso]
|
||||
|
||||
*sh = > dt.in_zone dt=`m` zone="Asia/Shanghai"*
|
||||
> print text=`sh`[^iso]
|
||||
|
||||
*p = > dt.parse text="2020-01-02T03:04:05+08:00"*
|
||||
*u = > dt.to_unix dt=`p`*
|
||||
> print text=`u`
|
||||
|
||||
*n = > dt.add dt=`m` days=1*
|
||||
*nu = > dt.to_unix dt=`n`*
|
||||
> print text=`nu`
|
||||
|
||||
*d = > dt.format dt=`sh` style="date"*
|
||||
> print text=`d`
|
||||
@@ -0,0 +1,32 @@
|
||||
---
|
||||
title: fs mid2 M9 smoke
|
||||
import fs:lib/fs.mq.md
|
||||
---
|
||||
|
||||
# main
|
||||
|
||||
> fs.make_dirs path="m9-tree/nested"
|
||||
|
||||
> fs.write_text path="m9-tree/a.txt" text="A"
|
||||
|
||||
> fs.write_text path="m9-tree/nested/b.txt" text="B"
|
||||
|
||||
*st = > fs.stat path="m9-tree/a.txt"*
|
||||
> print text=`st`[^size]
|
||||
> print text=`st`[^is_file]
|
||||
> print text=`st`[^is_dir]
|
||||
|
||||
*w = > fs.walk path="m9-tree"*
|
||||
*n = > len `w`*
|
||||
> print text=`n`
|
||||
*p0 = > at value=`w` index=0*
|
||||
*p1 = > at value=`w` index=1*
|
||||
*p2 = > at value=`w` index=2*
|
||||
> print text=`p0`
|
||||
> print text=`p1`
|
||||
> print text=`p2`
|
||||
|
||||
> fs.remove_tree path="m9-tree"
|
||||
|
||||
*gone = > fs.exists path="m9-tree"*
|
||||
> print text=`gone`
|
||||
@@ -0,0 +1,33 @@
|
||||
---
|
||||
title: lib/stats + log fields M10 smoke
|
||||
import stats:lib/stats.mq.md
|
||||
import log:lib/log.mq.md
|
||||
---
|
||||
|
||||
# main
|
||||
|
||||
`xs` =
|
||||
|
||||
| |
|
||||
|---|
|
||||
| 1 |
|
||||
| 2 |
|
||||
| 3 |
|
||||
| 4 |
|
||||
|
||||
*m = > stats.mean list=`xs`*
|
||||
> print text=`m`
|
||||
|
||||
*med = > stats.median list=`xs`*
|
||||
> print text=`med`
|
||||
|
||||
*s = > stats.stdev list=`xs`*
|
||||
> print text=`s`
|
||||
|
||||
`fld` =
|
||||
|
||||
| user | n |
|
||||
|------|---|
|
||||
| alice | 3 |
|
||||
|
||||
> log.info text="hi" fields=`fld`
|
||||
@@ -0,0 +1,24 @@
|
||||
---
|
||||
title: lib/toml html encoding M8 smoke
|
||||
import toml:lib/toml.mq.md
|
||||
import html:lib/html.mq.md
|
||||
import enc:lib/encoding.mq.md
|
||||
---
|
||||
|
||||
# main
|
||||
|
||||
*cfg = > toml.parse text="name = \"marqdo\"\ncount = 2\n[pkg]\nver = \"1\"\n"*
|
||||
> print text=`cfg`[^name]
|
||||
> print text=`cfg`[^count]
|
||||
*pkg = `cfg`[^pkg]*
|
||||
> print text=`pkg`[^ver]
|
||||
|
||||
*e = > html.escape text="a<b>&\"c'"*
|
||||
> print text=`e`
|
||||
*u = > html.unescape text=`e`*
|
||||
> print text=`u`
|
||||
|
||||
*b = > enc.base32_encode text="hello"*
|
||||
> print text=`b`
|
||||
*back = > enc.base32_decode text=`b`*
|
||||
> print text=`back`
|
||||
@@ -0,0 +1,25 @@
|
||||
---
|
||||
title: lib/url smoke
|
||||
import url:lib/url.mq.md
|
||||
---
|
||||
|
||||
# main
|
||||
|
||||
*u = > url.parse text="https://example.com:8443/a/b?x=1&y=2#frag"*
|
||||
> print text=`u`[^scheme]
|
||||
> print text=`u`[^host]
|
||||
> print text=`u`[^port]
|
||||
> print text=`u`[^path]
|
||||
> print text=`u`[^query]
|
||||
> print text=`u`[^fragment]
|
||||
|
||||
*q = > url.query_parse text="a=1&b=hi%20x&a=2"*
|
||||
> print text=`q`[^b]
|
||||
*as = `q`[^a]*
|
||||
*a0 = > at value=`as` index=0*
|
||||
*a1 = > at value=`as` index=1*
|
||||
> print text=`a0`
|
||||
> print text=`a1`
|
||||
|
||||
*s = > url.query_stringify map=`q`*
|
||||
> print text=`s`
|
||||
@@ -0,0 +1,12 @@
|
||||
---
|
||||
title: lib/地址 烟测
|
||||
导入 址:lib/地址.mq.md
|
||||
---
|
||||
|
||||
# main
|
||||
|
||||
*u = > 址.解析 内容="https://example.com/a?x=1"*
|
||||
> print text=`u`[^scheme]
|
||||
> print text=`u`[^host]
|
||||
> print text=`u`[^path]
|
||||
> print text=`u`[^query]
|
||||
@@ -0,0 +1,22 @@
|
||||
---
|
||||
title: 文件 Mid2 M9 烟测
|
||||
导入 文件:lib/文件.mq.md
|
||||
---
|
||||
|
||||
# main
|
||||
|
||||
> 文件.建目录树 路径="m9-zh/子"
|
||||
|
||||
> 文件.写文本 路径="m9-zh/a.txt" 内容="A"
|
||||
|
||||
*st = > 文件.状态 路径="m9-zh/a.txt"*
|
||||
> print text=`st`[^is_file]
|
||||
|
||||
*w = > 文件.遍历 路径="m9-zh"*
|
||||
*n = > 长度 `w`*
|
||||
> print text=`n`
|
||||
|
||||
> 文件.删目录树 路径="m9-zh"
|
||||
|
||||
*gone = > 文件.存在 路径="m9-zh"*
|
||||
> print text=`gone`
|
||||
@@ -0,0 +1,16 @@
|
||||
---
|
||||
title: lib/日期时间 烟测
|
||||
导入 日时:lib/日期时间.mq.md
|
||||
---
|
||||
|
||||
# main
|
||||
|
||||
*m = > 日时.自戳 秒=0*
|
||||
> print text=`m`[^iso]
|
||||
|
||||
*sh = > 日时.时区 时刻=`m` 区="Asia/Shanghai"*
|
||||
> print text=`sh`[^iso]
|
||||
|
||||
*p = > 日时.解析 内容="2020-01-02T03:04:05+08:00"*
|
||||
*u = > 日时.成戳 时刻=`p`*
|
||||
> print text=`u`
|
||||
@@ -0,0 +1,25 @@
|
||||
---
|
||||
title: lib/统计 日志 M10 烟测
|
||||
导入 统计:lib/统计.mq.md
|
||||
导入 日志:lib/日志.mq.md
|
||||
---
|
||||
|
||||
# main
|
||||
|
||||
`xs` =
|
||||
|
||||
| |
|
||||
|---|
|
||||
| 2 |
|
||||
| 4 |
|
||||
|
||||
*m = > 统计.均值 列表=`xs`*
|
||||
> print text=`m`
|
||||
|
||||
`fld` =
|
||||
|
||||
| 谁 | n |
|
||||
|----|---|
|
||||
| 甲 | 1 |
|
||||
|
||||
> 日志.信息 内容="你好" 字段=`fld`
|
||||
@@ -0,0 +1,18 @@
|
||||
---
|
||||
title: lib/配置表 超文本 编码 烟测
|
||||
导入 配置:lib/配置表.mq.md
|
||||
导入 超:lib/超文本.mq.md
|
||||
导入 编:lib/编码.mq.md
|
||||
---
|
||||
|
||||
# main
|
||||
|
||||
*cfg = > 配置.解析 内容="name = \"中文\"\nok = true\n"*
|
||||
> print text=`cfg`[^name]
|
||||
> print text=`cfg`[^ok]
|
||||
|
||||
*e = > 超.转义 内容="a<b>"*
|
||||
> print text=`e`
|
||||
|
||||
*b = > 编.基32编码 内容="hi"*
|
||||
> print text=`b`
|
||||
Reference in new issue
Block a user