skill-calorie 0.2.3 → 0.2.5

package/dist/diet/log.js

@@ -0,0 +1,152 @@
+import { shiftISODate, todayISO } from '../analysis/utils.js';
+import { MEALS, WATER_NAME, addMeal, addMealsBatch, copyMeals, getDailySummary } from '../fetch/diet.js';
+import { CalorieRenderError } from '../render/errors.js';
+import { assertISO, fail, needArr, needNum, optNum, optStr, wday } from '../shared/params.js';
+import { F, R, commandLine, out } from '../shared/writeParts.js';
+import { ENTRY_PRECHECK } from './precheckPort.js';
+import { buildLabelPrecheckDoc } from './precheckLabel.js';
+import { buildLabelPrecheckView } from './precheckPort.js';
+/** `calorie.diet.add` · 记一餐（唤醒词 记一餐）。 */
+export function writeDietAdd(params, db) {
+    /* #277 · 「拍营养表」两条词的**第一步**：入口带 `entry:"precheck"` 时本命令只出**识别确认页**、
+       **不写库**（老实物 `nutrition_label_wizard.html` 的 `output_type` 是 `process`，
+       `scripts/build-help.mjs` 的流程句子逐字「过程：先出预检确认页 → 用户确认 → 跑这条命令」）。
+       确认之后跑的是同一条命令、去掉 `entry` 那一位——回执页仍是 #509／#270 那一张，行为一字不差。 */
+    if (optStr(params, 'entry') === ENTRY_PRECHECK) {
+        const v = buildLabelPrecheckView(params);
+        const page = buildLabelPrecheckDoc(v, v.date !== '', commandLine('calorie.diet.add', params));
+        return { data: out(R('拍营养表确认', 'create', '这一页只做确认、不写库；确认后再跑同一条命令去掉入口标记即写入', '拍营养表确认', 'food_log (写前确认页)', {
+                recordId: null, noChange: true, ids: [], idSource: 'none', writtenFields: [],
+            })).data, html: page };
+    }
+    const foodName = (optStr(params, 'foodName') ?? optStr(params, 'food_name') ?? '');
+    if (!foodName.trim())
+        fail(2, '缺参数 foodName');
+    const calories = needNum(params, 'calories');
+    const protein = needNum(params, 'protein');
+    for (const [k, v] of [['calories', calories], ['protein', protein]]) {
+        if (v < 0)
+            fail(2, k + ' 不能为负');
+    }
+    for (const k of ['carbs', 'fat']) {
+        const v = optNum(params, k);
+        if (v !== undefined && v < 0)
+            fail(2, k + ' 不能为负');
+    }
+    const grams0 = optNum(params, 'grams');
+    if (grams0 !== undefined && grams0 <= 0)
+        fail(2, 'grams 必须为正');
+    const date = wday(params, 'date');
+    if (date)
+        assertISO(date, 'date');
+    const meal = optStr(params, 'meal') ?? optStr(params, 'mealOverride');
+    if (meal !== undefined && !MEALS.includes(meal))
+        fail(2, '--meal 须为 ' + MEALS.join('、'));
+    const r = addMeal(db, {
+        foodName: foodName.trim(), calories, protein,
+        carbs: optNum(params, 'carbs') ?? 0, fat: optNum(params, 'fat') ?? 0,
+        grams: optNum(params, 'grams') ?? 100, note: optStr(params, 'note'),
+        date, time: optStr(params, 'time'), mealOverride: meal,
+    });
+    /* #496 · 页面标题原写死「记一餐」，而这一条命令底下挂着 5 个唤醒词（记一餐／记一餐（含备注）／
+       补记饮食／拍营养表记一餐／拍营养表补记一餐）：补记饮食那一页顶着「记一餐 · 回执」，
+       与进来的唤醒词对不上（审查件第 22 条）。命令收不到唤醒词，只能按**这次写入自己的事实**取标题：
+       给了日期＝补记（不是现在吃的这一顿）；带了备注＝含备注。两者都不是的才是普通记一餐。 */
+    const note = optStr(params, 'note');
+    const hasNote = note !== undefined && note.trim() !== '';
+    const backfill = date !== undefined;
+    /* #509 · 上面那三种事实还分不出「拍营养表记一餐／拍营养表补记一餐」这两个入口——它俩的参数与
+       普通记一餐／补记饮食全同（都带 `note`、都带 `date`），差别只在用户点的是哪条唤醒词，
+       命令这一层看不见（审查件第 21、27 条点名的「05 与 01 逐字节相同」就是这两页）。⇒ 由**入口**
+       自己带一个来源标记：`source:'photo'`（`src/diet/routes.ts` 那两条拍营养表的记录照 #276 给
+       `看有备注的饮食记录` 带 `hasNote` 的同款做法传）。它只是上屏措辞的开关：
+       参数名不上屏、不写库、不进 `writtenFields`；不给这个参数时行为与从前一字不差。 */
+    const photo = optStr(params, 'source') === 'photo';
+    const scene = backfill
+        ? (photo ? '拍照补记一餐' : '补记饮食')
+        : (photo ? '拍照记一餐' : (hasNote ? '记一餐（含备注）' : '记一餐'));
+    const said = (backfill ? '已补记：' : '已记一餐：') + r.food_name + ' ' + r.date + ' ' + r.time + '（' + r.meal + '）';
+    if (r.duplicate) {
+        return out(R(scene, 'create', String(r.message ?? '重复记录已跳过'), scene, 'food_log (写库回执)', {
+            recordId: r.dupId ?? null, noChange: true,
+            ids: r.dupId ? [r.dupId] : [], idSource: r.dupId ? 'record' : 'none', writtenFields: [],
+        }));
+    }
+    const remain = r.remainingCal === null || r.remainingCal === undefined ? '' : ' · 今日剩 ' + r.remainingCal + ' 卡';
+    /* #496 · 副题把备注原文带上（审查件第 21、27 条：「含备注」那一页与普通记一餐逐字节相同，
+       读者看不出备注记到了哪里）。 */
+    const noteText = hasNote ? ' · 备注：' + String(note) : '';
+    /* #509 · 拍照入口的两页（05 拍营养表记一餐／06 拍营养表补记一餐）另带一行来源：
+       读者点两个入口看到的是两张一样的页——这一行就是「同一顿、这次是照着包装营养表记的」那处差异。 */
+    const sourceText = photo ? ' · 来源：营养表照片' : '';
+    return out(R(scene, 'create', said + sourceText + noteText + remain, scene, 'food_log (写库回执)', {
+        recordId: r.id, ids: r.id === null ? [] : [r.id], writtenFields: [...F.diet],
+        items: [{ id: r.id ?? undefined, date: r.date, status: '成功', reason: '', detail: r.food_name }],
+    }));
+}
+/** `calorie.diet.batch` · 批量补记饮食。 */
+export function writeDietBatch(params, db) {
+    const items = needArr(params, 'items');
+    if (items.length > 200)
+        fail(2, 'items 至多 200 条');
+    const r = addMealsBatch(db, items.map((e) => {
+        const o = (e ?? {});
+        const food = o['foodName'] ?? o['food_name'];
+        return {
+            date: o['date'] === undefined ? undefined : String(o['date']),
+            time: o['time'] === undefined ? undefined : String(o['time']),
+            food_name: food === undefined ? undefined : String(food),
+            grams: o['grams'], calories: o['calories'],
+            protein: o['protein'], carbs: o['carbs'],
+            fat: o['fat'], note: o['note'] === undefined ? undefined : String(o['note']),
+        };
+    }));
+    return out(R('批量补记饮食', 'create', '批量记饮食：新增 ' + r.added + '，跳过 ' + r.skipped + '，失败 ' + r.failed, '批量补记饮食', 'food_log (写库回执)', {
+        noChange: r.added === 0, ids: [], idSource: 'condition',
+        writtenFields: r.added > 0 ? [...F.diet] : [],
+        items: r.failures.slice(0, 20).map(([idx, reason]) => ({ status: '失败', reason, detail: '第' + idx + '条' })),
+    }));
+}
+/** `calorie.diet.copy` · 复制昨日饮食。 */
+export function writeDietCopy(params, db) {
+    const today = todayISO();
+    const from = wday(params, 'from') ?? wday(params, 'fromDate') ?? shiftISODate(today, -1);
+    const to = wday(params, 'to') ?? wday(params, 'toDate') ?? today;
+    assertISO(from, 'from');
+    assertISO(to, 'to');
+    const r = copyMeals(db, from, to);
+    if (r.copied + r.skipped === 0)
+        throw new CalorieRenderError('missing-data', '来源无饮食记录（' + from + '）');
+    return out(R('复制昨日饮食', 'create', '已复制饮食 ' + from + '→' + to + '：复制 ' + r.copied + '，跳过 ' + r.skipped, '复制昨日饮食', 'food_log (写库回执)', {
+        noChange: r.copied === 0, ids: [], idSource: 'condition',
+        writtenFields: r.copied > 0 ? [...F.diet] : [],
+    }));
+}
+/** `calorie.water.log` · 记喝水。 */
+export function writeWaterLog(params, db) {
+    const ml = needNum(params, 'ml');
+    if (!(ml > 0) || ml > 10000)
+        fail(2, 'ml 须为 0..10000 毫升');
+    const date = wday(params, 'date');
+    if (date)
+        assertISO(date, 'date');
+    const r = addMeal(db, {
+        foodName: WATER_NAME, calories: 0, protein: 0, grams: ml,
+        note: optStr(params, 'note'), date, time: optStr(params, 'time'),
+    });
+    if (r.duplicate) {
+        // 与 `calorie.diet.add` 同口径（§3.3 `record`）：重复跳过的原 id 由 fetch 回传（`fetch/diet.ts:96`），
+        // 拿得到就报 `record`＋`ids=[dupId]`，拿不到才退 `none`（返修 R-3／蓝队 D-3 统一）。
+        return out(R('记喝水', 'create', String(r.message ?? '重复记录已跳过'), '记喝水', 'food_log (写库回执)', {
+            recordId: r.dupId ?? null, noChange: true,
+            ids: r.dupId ? [r.dupId] : [], idSource: r.dupId ? 'record' : 'none', writtenFields: [],
+        }));
+    }
+    const day = date ?? todayISO();
+    const sum = getDailySummary(db, day);
+    return out(R('记喝水', 'create', '已记喝水 ' + ml + ' ml（' + day + ' 累计 ' + sum.waterMl + ' ml）', '记喝水', 'food_log (写库回执)', {
+        recordId: r.id, ids: r.id === null ? [] : [r.id], writtenFields: [...F.water],
+        items: [{ id: r.id ?? undefined, date: r.date, status: '成功', reason: '', detail: ml + 'ml' }],
+    }));
+}
+//# sourceMappingURL=log.js.map

package/dist/diet/log.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"log.js","sourceRoot":"","sources":["../../src/diet/log.ts"],"names":[],"mappings":"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"}

package/dist/diet/nutrition.d.ts

@@ -0,0 +1,37 @@
+/** 饮食能力的子功能「看营养」（HELP 场景 02「饮食」下一级 diet_5）：营养配比／营养素深度／
+ * 批量导入预览／营养表识别确认。
+ *
+ * #315 纯搬迁：三个处理体**逐字搬自** `src/cli/cmd_read.ts` 的对应 `case`（语义不动，只换住处）。
+ * 取数走 `diet/nutritionPort.ts`，装配走同名 `*Docs.ts` 的公开接口。
+ * 三条声明住 `./commands.ts`；对外只经 `./index.ts`。
+ *
+ * #275 · **两态分清**（`t425` 裁定 4 的 2026-09-15 澄清）：这两条读命令在窗口零记录时不再笼统地
+ * 走缺失阻断——**窗口为空**（别处还有记录）出完整空态页 ＋ 空态句 ＋ 引导句；
+ * **库为空**仍原样抛出去走 `exit 4`（既有设计行为）。分辨点就在本件（取数层只负责抛）。
+ *
+ * #277 · 本件第三、四条处理体换成**预检确认页**（老实物 `batch_import_preview.html`／
+ * `nutrition_label_wizard.html`）：取数与逐行校验搬到 `./precheckPort.ts`、装配搬到 `./precheck.ts`。
+ * 两条都不写库（老实物 `output_type` 是 `result`／`process`）；真写库由 `calorie.product.import`／
+ * `calorie.diet.add` 承担，确认页把它们印在「确认后操作」块与复制日志第 4 段里。
+ */
+import type { DatabaseSync } from 'node:sqlite';
+import type { ViewOut } from '../shared/commandSpec.js';
+/** `calorie.view.nutrition-ratio` · 营养配比。 */
+export declare function viewNutritionRatio(params: Record<string, unknown>, db: DatabaseSync): ViewOut;
+/** `calorie.view.nutrition-detail` · 营养素深度。 */
+export declare function viewNutritionDetail(params: Record<string, unknown>, db: DatabaseSync): ViewOut;
+/** `calorie.view.batch-import-preview` · 导入预检页（#277 按老实物 `batch_import_preview.html` 重做）。
+ *
+ *  同一张页两个形态，由**入口标记**选（`src/diet/routes.ts` 那几条记录自己带）：
+ *  「校验批量导入」带 `entry:'validate'` ⇒ 校验形态（逐行结果与失败原因）；其余 ⇒ 预览形态。
+ *  两形态都不写库（老实物 `output_type` 是 `result`／`process`，写库只发生在用户确认之后）。
+ *  `data.metrics` 四个键是 #113 起的冻结形状，不随形态变。 */
+export declare function viewBatchImportPreview(params: Record<string, unknown>, db: DatabaseSync): ViewOut;
+/** `calorie.view.label-precheck` · 营养表识别确认页（#277 新建；老实物 `nutrition_label_wizard.html`）。
+ *
+ *  「拍营养表记一餐／拍营养表补记一餐」两条词的第一步就是这一页——识别在模型侧，
+ *  模型把识别到的字段照 `t276-营养表映射.md` 那张表填成参数递进来，本命令只把它摆成页给人核对，
+ *  **不写库**；用户确认之后跑的是 `calorie.diet.add`（页上「确认后操作」块给出字段与取值，
+ *  复制日志第 4 段给出那条命令原文）。两条词共用这一条命令：带日期＝补记那一支（页头与措辞按它换）。 */
+export declare function viewLabelPrecheck(params: Record<string, unknown>, db: DatabaseSync): ViewOut;
+//# sourceMappingURL=nutrition.d.ts.map

package/dist/diet/nutrition.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"nutrition.d.ts","sourceRoot":"","sources":["../../src/diet/nutrition.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AACH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAOhD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AAUxD,6CAA6C;AAC7C,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,EAAE,EAAE,YAAY,GAAG,OAAO,CA8B7F;AAED,+CAA+C;AAC/C,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,EAAE,EAAE,YAAY,GAAG,OAAO,CAwC9F;AAED;;;;;6CAK6C;AAC7C,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,EAAE,EAAE,YAAY,GAAG,OAAO,CASjG;AAED;;;;;yDAKyD;AACzD,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,EAAE,EAAE,YAAY,GAAG,OAAO,CAmB5F"}

package/dist/diet/nutrition.js

@@ -0,0 +1,135 @@
+import { buildNutritionDetailView, buildNutritionRatioView, hasAnyDietRow } from './nutritionPort.js';
+import { buildEmptyWindowDoc, buildNutritionDetailDoc, buildNutritionRatioDoc } from './nutritionPortDocs.js';
+import { buildImportPrecheckView, buildLabelPrecheckView, ENTRY_VALIDATE } from './precheckPort.js';
+import { buildImportPrecheckDoc } from './precheck.js';
+import { buildLabelPrecheckDoc } from './precheckLabel.js';
+import { CalorieRenderError } from '../render/errors.js';
+import { defaultRange, nums, optStr } from '../shared/params.js';
+import { commandLine } from '../shared/writeParts.js';
+/** 窗口为空那一态的分辨：取数层抛的是缺失阻断，**抛出来的有没有底由这里判**——库里别处还有记录
+ *  ⇒ 这是「这段没记」而不是「没得取」，出完整空态页；连底都没有 ⇒ 原样抛出去走 exit 4。 */
+function isWindowEmpty(e, db) {
+    return e instanceof CalorieRenderError && e.code === 'missing-data' && hasAnyDietRow(db);
+}
+/** `calorie.view.nutrition-ratio` · 营养配比。 */
+export function viewNutritionRatio(params, db) {
+    const { start, end } = defaultRange(db, params);
+    /* #275 · 复制日志第 4 段「调用链」＝**本次命令原文**（含 `--params`），照抄可重跑（裁定 7）；
+       命令原文由命令层的共用件 `shared/writeParts.ts` 的 `commandLine()` 派生，页面件不自己拼。 */
+    const command = commandLine('calorie.view.nutrition-ratio', params);
+    let v;
+    try {
+        v = buildNutritionRatioView(db, start, end);
+    }
+    catch (e) {
+        if (!isWindowEmpty(e, db))
+            throw e;
+        return {
+            data: { metrics: {} },
+            html: buildEmptyWindowDoc({
+                key: 'calorie.view.nutrition-ratio',
+                metaLeft: '查营养配比（饮食）',
+                title: '🥗 营养配比',
+                blockTitle: '配比读数',
+                emptyText: '这段日子（' + start + ' ~ ' + end + '）一条饮食记录也没有，配比算不出来（不编数）。',
+                guide: '要让它有内容，先用「记一餐」把其中一天吃的东西记上（可带日期与时间），再来看配比。',
+                footnote: '📊 数据来源 · 饮食记录 · ' + start + ' → ' + end + '（按营养素折算）',
+                command,
+            }),
+        };
+    }
+    const metrics = nums({
+        totalCalorie: v.totalCalorie, proteinG: v.proteinG, proteinPct: v.proteinPct,
+        carbG: v.carbG, carbPct: v.carbPct, fatG: v.fatG, fatPct: v.fatPct,
+        targetProteinG: v.targetProteinG, targetCarbG: v.targetCarbG, targetFatG: v.targetFatG,
+    });
+    return { data: { metrics }, html: buildNutritionRatioDoc(v, command) };
+}
+/** `calorie.view.nutrition-detail` · 营养素深度。 */
+export function viewNutritionDetail(params, db) {
+    const { start, end } = defaultRange(db, params);
+    /* #511 · 两个唤醒词共用这一条命令（看营养素深度／看营养素明细），参数一字不差 ⇒ 由入口自己带
+       `entry` 标记（`src/diet/routes.ts` 那条「看营养素明细」的记录），页头按它出标题。
+       不给标记（含未知参数名）＝从前的「营养素深度」那一支，行为一字不差。 */
+    const entry = optStr(params, 'entry');
+    const command = commandLine('calorie.view.nutrition-detail', params);
+    let v;
+    try {
+        v = buildNutritionDetailView(db, start, end);
+    }
+    catch (e) {
+        if (!isWindowEmpty(e, db))
+            throw e;
+        const detail = entry === 'detail';
+        return {
+            data: { metrics: {} },
+            html: buildEmptyWindowDoc({
+                key: 'calorie.view.nutrition-detail',
+                metaLeft: (detail ? '看营养素明细' : '看营养素深度') + '（饮食）',
+                title: detail ? '🧪 营养素明细' : '🧪 营养素深度',
+                blockTitle: '逐项明细',
+                emptyText: '这段日子（' + start + ' ~ ' + end + '）一条饮食记录也没有，营养素合计算不出来（不编数）。',
+                guide: '要让它有内容，先用「记一餐」把其中一天吃的东西记上；'
+                    + '食品库里查不到营养值的食物，用「存食品」补上营养值。',
+                footnote: '📊 数据来源 · 饮食记录 × 食品库 · ' + start + ' → ' + end + '（按食物名折算）',
+                command,
+            }),
+        };
+    }
+    const metrics = nums({
+        days: v.days,
+        matchedMeals: v.matchedMeals,
+        missingFoods: v.missingFoods.length,
+        fiberAvg: v.items[0]?.avg,
+        sodiumAvg: v.items[1]?.avg,
+        sugarAvg: v.items[2]?.avg,
+        fiberPct: v.items[0]?.pct,
+        sodiumPct: v.items[1]?.pct,
+        sugarPct: v.items[2]?.pct,
+    });
+    return { data: { metrics }, html: buildNutritionDetailDoc(v, entry, command) };
+}
+/** `calorie.view.batch-import-preview` · 导入预检页（#277 按老实物 `batch_import_preview.html` 重做）。
+ *
+ *  同一张页两个形态，由**入口标记**选（`src/diet/routes.ts` 那几条记录自己带）：
+ *  「校验批量导入」带 `entry:'validate'` ⇒ 校验形态（逐行结果与失败原因）；其余 ⇒ 预览形态。
+ *  两形态都不写库（老实物 `output_type` 是 `result`／`process`，写库只发生在用户确认之后）。
+ *  `data.metrics` 四个键是 #113 起的冻结形状，不随形态变。 */
+export function viewBatchImportPreview(params, db) {
+    const entry = optStr(params, 'entry');
+    const validate = entry === ENTRY_VALIDATE;
+    const command = commandLine('calorie.view.batch-import-preview', params);
+    const v = buildImportPrecheckView(db, params['items']);
+    const metrics = nums({
+        total: v.total, matched: v.matched, missing: v.missing, totalCalorie: v.totalCalorie,
+    });
+    return { data: { metrics }, html: buildImportPrecheckDoc(v, entry, command, validate) };
+}
+/** `calorie.view.label-precheck` · 营养表识别确认页（#277 新建；老实物 `nutrition_label_wizard.html`）。
+ *
+ *  「拍营养表记一餐／拍营养表补记一餐」两条词的第一步就是这一页——识别在模型侧，
+ *  模型把识别到的字段照 `t276-营养表映射.md` 那张表填成参数递进来，本命令只把它摆成页给人核对，
+ *  **不写库**；用户确认之后跑的是 `calorie.diet.add`（页上「确认后操作」块给出字段与取值，
+ *  复制日志第 4 段给出那条命令原文）。两条词共用这一条命令：带日期＝补记那一支（页头与措辞按它换）。 */
+export function viewLabelPrecheck(params, db) {
+    const command = commandLine('calorie.view.label-precheck', params);
+    const v = buildLabelPrecheckView(params);
+    const backfill = v.date !== '';
+    /* 读数投影只收确定数字（`nums` 的冻结口径）：识别成 `—` 的那一格不进投影，不上屏 0。 */
+    const numOfField = (key) => {
+        const raw = v.fields.find((f) => f.key === key)?.value;
+        if (raw === undefined || raw === '—')
+            return undefined;
+        const n = Number(raw);
+        return Number.isNaN(n) ? undefined : n;
+    };
+    const metrics = nums({
+        calories: v.totalCalorie,
+        protein: numOfField('protein'),
+        carbs: numOfField('carbohydrates'),
+        fat: numOfField('fat'),
+        uncertain: v.uncertainCount,
+    });
+    return { data: { metrics }, html: buildLabelPrecheckDoc(v, backfill, command) };
+}
+//# sourceMappingURL=nutrition.js.map

package/dist/diet/nutrition.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"nutrition.js","sourceRoot":"","sources":["../../src/diet/nutrition.ts"],"names":[],"mappings":"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"}

package/dist/diet/nutritionPort.d.ts

@@ -0,0 +1,126 @@
+/** #112 · 营养移植 4 键取数（t71 需移植 nutrition_ratio／nutrition_detail／
+ * source_stats／today_water 四模板的数据面）。
+ *
+ * #275 追加：`buildDietOverviewView`（饮食总览两周累计）——服务 `calorie.view.diet` 的
+ * 「看饮食总览」区块，作者＝#271；老脚本口径住 `scripts/render_diet_overview.py`（只读）。
+ *
+ * 口径（旧脚本逐行对照，见证据 t112 §1）：
+ * - 窗查询一律 food_log（水行按新侧约定以 WATER_NAME 排除；水行宏量全 0，
+ *   排除与否数值无差）／nutrition_products（is_deprecated＝0，沿旧 product_library）。
+ * - R1 收敛（#111 T2 记账）：本域无分类推断——食物名原样使用，不做任何按名
+ *   推断；nutrition_detail 的库匹配为**精确名匹配**（沿旧 `food not in lib`），
+ *   不做子串（R12 在本票的收敛点：双向子串是运动 review 域口径，不扩散到本域）。
+ * - R11 收敛：today-water 的 7 天窗＝date 当天往前 6 个自然日（沿旧“含今天，
+ *   最早 6 天前”），不做周一派生（周一口径是计划会话域口径，不扩散到本域）。
+ * 缺失阻断不返空：窗内无行／库空／目标缺失可展示即 `missing-data`（G5 #100 口径）；
+ * 日期非法即 `bad-input`。本层只做取数＋聚合，不组 HTML（组装归 `diet/nutritionPortDocs.ts`）。
+ */
+import type { DatabaseSync } from 'node:sqlite';
+import type { NutritionRange } from '../shared/nutritionRange.js';
+/** 库里到底有没有底：**窗口为空**与**库为空**的分辨判据（`t425` 裁定 4 的 2026-09-15 澄清）。
+ *
+ *  本层的三个取数口在窗内零行时一律抛 `missing-data`（沿 G5 #100「缺失阻断不返空」）——那一条不改。
+ *  两态的分辨**由调用点做**：抛出来的若带底（别处还有记录），就是「这条词跑得通、只是这段没记」，
+ *  出完整空态页；若连底都没有，原样抛出去走 exit 4（**既有设计行为，任何票不得据裁定 4 去改它**）。
+ *
+ *  判据只看这一张表的行数在不在，不看错误文案（文案会随取数层改）。 */
+export declare function hasAnyDietRow(db: DatabaseSync): boolean;
+export type NutritionRatioRange = NutritionRange;
+export interface NutritionRatioView {
+    start: string;
+    end: string;
+    days: number;
+    totalCalorie: number;
+    proteinG: number;
+    proteinPct: number;
+    carbG: number;
+    carbPct: number;
+    fatG: number;
+    fatPct: number;
+    balance: 'good' | 'warn' | 'bad';
+    targetProteinG: number | null;
+    targetCarbG: number | null;
+    targetFatG: number | null;
+    range: {
+        protein: NutritionRatioRange;
+        carb: NutritionRatioRange;
+        fat: NutritionRatioRange;
+    };
+}
+export declare function buildNutritionRatioView(db: DatabaseSync, start: string, end: string): NutritionRatioView;
+export interface NutrientItem {
+    key: string;
+    label: string;
+    unit: string;
+    value: number;
+    avg: number;
+    target: number;
+    pct: number;
+    good: string;
+    status: 'ok' | 'over';
+}
+export interface NutritionDetailView {
+    start: string;
+    end: string;
+    days: number;
+    items: NutrientItem[];
+    matchedMeals: number;
+    missingFoods: string[];
+}
+export declare function buildNutritionDetailView(db: DatabaseSync, start: string, end: string): NutritionDetailView;
+export interface SourceStatsItem {
+    source: string;
+    count: number;
+    pct: number;
+}
+export interface SourceStatsView {
+    total: number;
+    sources: number;
+    items: SourceStatsItem[];
+}
+export declare function buildSourceStatsView(db: DatabaseSync): SourceStatsView;
+export interface OverviewDay {
+    date: string;
+    calorie: number;
+}
+/** 一段周期累计（老 `render_diet_overview.py::_aggregate` 的字段逐字）。 */
+export interface DietOverviewPeriod {
+    start: string;
+    end: string;
+    /** 窗内自然日数（老 `days`；`start > end` 即 0——今天正好是窗口首日时出现）。 */
+    days: number;
+    /** 有记录天数（老 `with_data_days`，逐日 GROUP BY 的行数）。 */
+    loggedDays: number;
+    totalCalorie: number;
+    /** 日均＝总热量 ÷ max(1, 自然日数)（老口径：分母是窗口天数，不是有记录天数）。 */
+    avgCalorie: number;
+    totalProtein: number;
+    /** 逐日序列（含无记录日，值 0；老 `#44` 补全完整窗口那条）。 */
+    daily: OverviewDay[];
+}
+export interface DietOverviewView {
+    today: string;
+    week: DietOverviewPeriod;
+    month: DietOverviewPeriod;
+}
+/** 饮食总览取数（服务 `calorie.view.diet` 的「看饮食总览」区块，作者＝#271）：
+ *  **不含今日**（老脚本 2026-08-01 对抗审查修复那条：今日由主页「看今日饮食概览」承接）；
+ *  **不抛 missing-data**——它是宿主页面里的一块，缺失阻断由宿主按自己的窗口做，本层给零值 ＋
+ *  `loggedDays` 让块自己出「无记录」空态（不编数）。 */
+export declare function buildDietOverviewView(db: DatabaseSync, date: string): DietOverviewView;
+export interface WaterCup {
+    time: string;
+    ml: number;
+}
+export interface TodayWaterView {
+    date: string;
+    todayMl: number;
+    targetMl: number;
+    pct: number;
+    remainMl: number;
+    cups: WaterCup[];
+    weekMl: number[];
+    weekDates: string[];
+}
+export declare function buildTodayWaterView(db: DatabaseSync, date: string): TodayWaterView;
+//# sourceMappingURL=nutritionPort.d.ts.map

package/dist/diet/nutritionPort.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"nutritionPort.d.ts","sourceRoot":"","sources":["../../src/diet/nutritionPort.ts"],"names":[],"mappings":"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"}