diff --git a/CHANGELOG.md b/CHANGELOG.md index 4cde2b1..81c51b3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ ## Unreleased ### 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)。 diff --git a/doc/README.md b/doc/README.md index 3391fc1..90d75e0 100644 --- a/doc/README.md +++ b/doc/README.md @@ -39,6 +39,7 @@ | [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 路线(规划)** | diff --git a/doc/design/stdlib-mid2.md b/doc/design/stdlib-mid2.md index f1da2de..d02269e 100644 --- a/doc/design/stdlib-mid2.md +++ b/doc/design/stdlib-mid2.md @@ -2,7 +2,7 @@ | | | |---|---| -| 状态 | **Draft · M7–M9 已落地;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) | diff --git a/doc/design/stdlib-modules.md b/doc/design/stdlib-modules.md index 06d8b51..4efbf4d 100644 --- a/doc/design/stdlib-modules.md +++ b/doc/design/stdlib-modules.md @@ -24,12 +24,13 @@ | **逗号表** | `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 + **Mid2 M9**:`make_dirs` / `remove_tree` / `stat` / `walk` | | 系统 | `lib/sys.mq.md` | `lib/系统.mq.md` | 已有(含 `load_dotenv`) | @@ -46,7 +47,7 @@ **中层已落地:** M1–M6(含 log / uuid)— 见 [stdlib-mid.md](stdlib-mid.md) · [stdlib-log-uuid.md](stdlib-log-uuid.md)。 -**Mid2:** **M7–M9 done**(datetime / url / toml / html / base32 / fs++)— [stdlib-datetime.md](stdlib-datetime.md) · [stdlib-url.md](stdlib-url.md) · [stdlib-toml.md](stdlib-toml.md) · [stdlib-html.md](stdlib-html.md) · [stdlib-fs-mid2.md](stdlib-fs-mid2.md);M10 见 [stdlib-mid2.md](stdlib-mid2.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)。 diff --git a/doc/design/stdlib-stats-log.md b/doc/design/stdlib-stats-log.md new file mode 100644 index 0000000..5307efa --- /dev/null +++ b/doc/design/stdlib-stats-log.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 + +按路线图 **默认跳过**。 diff --git a/doc/design/stdlib.md b/doc/design/stdlib.md index e2502e4..14051d9 100644 --- a/doc/design/stdlib.md +++ b/doc/design/stdlib.md @@ -2,14 +2,14 @@ | | | |---|---| -| 状态 | **S0–S3 + 核心 L1 已落地 · Mid M1–M6 已落地 · Mid2(M7–M10)规划中** | -| 日期 | 2026-09-08 | +| 状态 | **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)。 > **中层标准库 Mid(M1–M6)**:已落地——[stdlib-mid.md](stdlib-mid.md) · [roadmap/stdlib-mid.md](../roadmap/stdlib-mid.md)。 -> **中层第二波 Mid2**:日历/URL/TOML/HTML/fs++ ——[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)。 +> **中层第二波 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)。 --- @@ -21,7 +21,7 @@ | **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 / secrets / csv / text++ / table++ / cli / log / uuid — [stdlib-mid.md](stdlib-mid.md) | -| **L1 Mid2** | **规划**:datetime / url / toml / html / fs++ — [stdlib-mid2.md](stdlib-mid2.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 / 用户站收录(随发版);应主要靠核心+中层、默认无插件 | diff --git a/doc/research/stdlib-gaps-after-mid.md b/doc/research/stdlib-gaps-after-mid.md index fdf972c..7e9b222 100644 --- a/doc/research/stdlib-gaps-after-mid.md +++ b/doc/research/stdlib-gaps-after-mid.md @@ -129,7 +129,7 @@ catalog / 工具配置若走向 TOML,只读 `toml.parse` 性价比高。YAML | **高** | **M7** | `datetime` + `url` — **done** | | **高** | **M8** | `toml` 只读 + `html.escape` + `encoding` base32 — **done** | | **中** | **M9** | `fs` 加厚(dirs/stat/walk) — **done** | -| **低** | **M10** | `stats` 薄 · 可选 zip · 结构化 log 字段 | +| **低** | **M10** | `stats` 薄 · log 字段 · (zip 默认跳过) — **done**(zip 仍跳过) | | **won't** | — | 完整 YAML · 模板引擎 · sqlite 进 `lib/` | --- diff --git a/doc/roadmap/next-phase.md b/doc/roadmap/next-phase.md index ed4b61c..28818c4 100644 --- a/doc/roadmap/next-phase.md +++ b/doc/roadmap/next-phase.md @@ -18,7 +18,7 @@ | **诊断** | 语句级 `path:line:col: message`;字节码指令带 `spans`;errors 金样例双后端断言位置 | **P0 完成** | | **view** | 结构 + 执行 + 源码 + 函数大纲/搜索;无断点 | 文档浏览器 | | **debug** | 独立 `marqdo debug`:断点 / 单步 / locals(树遍历) | **P3-D3 v1** | -| **标准库** | 核心 L1 + Mid M1–M6 已完成([stdlib-modules.md](../design/stdlib-modules.md));下一主线 = **Mid2**([stdlib-mid2.md](../design/stdlib-mid2.md) · [stdlib-mid2 路线](stdlib-mid2.md) · [缺口](../research/stdlib-gaps-after-mid.md)) | **P2 + Mid1 完成;Mid2 规划中** | +| **标准库** | 核心 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 是两条路径。 diff --git a/doc/roadmap/stdlib-mid2.md b/doc/roadmap/stdlib-mid2.md index 810abb7..d7db6bb 100644 --- a/doc/roadmap/stdlib-mid2.md +++ b/doc/roadmap/stdlib-mid2.md @@ -2,7 +2,7 @@ | | | |---|---| -| 状态 | **Active · M7–M9 已落地 · 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) | @@ -62,13 +62,16 @@ M10 收口糖(可选) stats 薄 · log 字段 · (zip 默认跳过) | 金样 | `fs-mid2-smoke`(中英) | | public | `16-fs-mid2` · `16-文件mid2` | -### M10 — 可选收口 — **todo** +### M10 — 可选收口 — **done**(zip 跳过) | 交付 | 说明 | |------|------| -| `stats` 或 `math` 均值/中位数 | 薄 | -| `log` 可选 `fields=` | 非远程 sink | -| 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) | --- @@ -77,9 +80,9 @@ M10 收口糖(可选) stats 薄 · log 字段 · (zip 默认跳过) - [x] M7 datetime + url - [x] M8 toml + html + base32 - [x] M9 fs 加厚 -- [ ] M10 可选 -- [ ] 研究文高优先级缺口 → closed -- [ ] `stdlib-modules.md` / `stdlib.md` 状态同步 +- [x] M10 可选(zip 跳过) +- [x] 研究文高优先级缺口 → closed(M7–M9;M10 为收口糖) +- [x] `stdlib-modules.md` / `stdlib.md` 状态同步 --- diff --git a/lib/log.mq.md b/lib/log.mq.md index 14029d2..bf028e6 100644 --- a/lib/log.mq.md +++ b/lib/log.mq.md @@ -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. * diff --git a/lib/stats.mq.md b/lib/stats.mq.md new file mode 100644 index 0000000..c61d5e0 --- /dev/null +++ b/lib/stats.mq.md @@ -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`** diff --git a/lib/日志.mq.md b/lib/日志.mq.md index 6668d64..7cb6b91 100644 --- a/lib/日志.mq.md +++ b/lib/日志.mq.md @@ -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. * diff --git a/lib/统计.mq.md b/lib/统计.mq.md new file mode 100644 index 0000000..d69929f --- /dev/null +++ b/lib/统计.mq.md @@ -0,0 +1,21 @@ +--- +title: lib/统计 +description: 薄均值 / 中位数 / 样本标准差(中层 Mid2 M10)。非数据框库。 +--- + +## 均值 + + `列表` + +**> host_stats_mean list=`列表`** + +## 中位数 + + `列表` + +**> host_stats_median list=`列表`** + +## 标准差 + + `列表` + +样本标准差;至少两个值。 + +**> host_stats_stdev list=`列表`** diff --git a/public/features/17-stats-log.mq.md b/public/features/17-stats-log.mq.md new file mode 100644 index 0000000..04877c1 --- /dev/null +++ b/public/features/17-stats-log.mq.md @@ -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` diff --git a/public/features/17-统计日志.mq.md b/public/features/17-统计日志.mq.md new file mode 100644 index 0000000..96e734d --- /dev/null +++ b/public/features/17-统计日志.mq.md @@ -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` diff --git a/src/host/dispatch.rs b/src/host/dispatch.rs index 8246c91..804c585 100644 --- a/src/host/dispatch.rs +++ b/src/host/dispatch.rs @@ -3,8 +3,8 @@ use std::collections::HashMap; use crate::host::{ - cli, csv, datetime, encoding, fs, hash, html_ops, json, log, math, net, path, re, secrets, sys, - text_ops, time, toml_ops, url_ops, 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}; @@ -195,6 +195,9 @@ pub enum HostFn { FsRemoveTree = 186, FsStat = 187, FsWalk = 188, + StatsMean = 189, + StatsMedian = 190, + StatsStdev = 191, } @@ -380,6 +383,9 @@ impl HostFn { 186 => Self::FsRemoveTree, 187 => Self::FsStat, 188 => Self::FsWalk, + 189 => Self::StatsMean, + 190 => Self::StatsMedian, + 191 => Self::StatsStdev, _ => return None, }) } @@ -568,6 +574,9 @@ impl HostFn { "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, }) } @@ -743,6 +752,9 @@ impl HostFn { 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", @@ -867,6 +879,7 @@ 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"], @@ -920,6 +933,7 @@ impl HostFn { Self::DatetimeParse => &["pattern"], Self::DatetimeFormat => &["style"], Self::DatetimeAdd => &["days", "hours", "minutes", "seconds"], + Self::LogLine => &["fields"], _ => &[], } } @@ -1372,7 +1386,15 @@ 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 => { diff --git a/src/host/log.rs b/src/host/log.rs index d59e3ea..32b8fa3 100644 --- a/src/host/log.rs +++ b/src/host/log.rs @@ -46,13 +46,32 @@ pub fn set_level(ctx: &mut HostContext, level: &Value) -> Result } /// Return a ready-to-print line, or `None` if filtered out. -pub fn line(ctx: &HostContext, level: &Value, text: &Value) -> Result { +/// 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 { 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())); } } diff --git a/src/host/mod.rs b/src/host/mod.rs index b1e9a13..71d72ee 100644 --- a/src/host/mod.rs +++ b/src/host/mod.rs @@ -24,6 +24,7 @@ mod net; mod path; mod re; mod secrets; +mod stats; mod text_ops; mod time; mod toml_ops; diff --git a/src/host/stats.rs b/src/host/stats.rs new file mode 100644 index 0000000..e8bf261 --- /dev/null +++ b/src/host/stats.rs @@ -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, 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 { + 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 { + 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 { + 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::() / n; + let var = xs.iter().map(|x| { + let d = x - mean; + d * d + }).sum::() + / (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); + } +} diff --git a/tests/gold.rs b/tests/gold.rs index e5d7e17..4896b8b 100644 --- a/tests/gold.rs +++ b/tests/gold.rs @@ -1242,6 +1242,22 @@ 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( diff --git a/tests/lib/stats-log-smoke.mq.md b/tests/lib/stats-log-smoke.mq.md new file mode 100644 index 0000000..b231578 --- /dev/null +++ b/tests/lib/stats-log-smoke.mq.md @@ -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` diff --git a/tests/lib/统计-日志-烟测.mq.md b/tests/lib/统计-日志-烟测.mq.md new file mode 100644 index 0000000..9bdb651 --- /dev/null +++ b/tests/lib/统计-日志-烟测.mq.md @@ -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`