skill-calorie 0.3.0 → 0.3.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/SKILL.md +1 -1
- package/dist/cli/config.d.ts +24 -1
- package/dist/cli/config.d.ts.map +1 -1
- package/dist/cli/config.js +20 -7
- package/dist/cli/config.js.map +1 -1
- package/dist/config.d.ts +10 -3
- package/dist/config.d.ts.map +1 -1
- package/dist/config.js +60 -7
- package/dist/config.js.map +1 -1
- package/dist/fetch/audit.d.ts +2 -2
- package/dist/health.d.ts.map +1 -1
- package/dist/health.js +46 -43
- package/dist/health.js.map +1 -1
- package/dist/output.d.ts +4 -3
- package/dist/output.d.ts.map +1 -1
- package/dist/output.js +7 -11
- package/dist/output.js.map +1 -1
- package/dist/paths.d.ts +23 -1
- package/dist/paths.d.ts.map +1 -1
- package/dist/paths.js +44 -6
- package/dist/paths.js.map +1 -1
- package/dist/photo/dir.d.ts +1 -1
- package/dist/photo/dir.d.ts.map +1 -1
- package/dist/photo/dir.js +1 -1
- package/dist/photo/dir.js.map +1 -1
- package/dist/photo/photos.d.ts +3 -2
- package/dist/photo/photos.d.ts.map +1 -1
- package/dist/photo/photos.js +7 -8
- package/dist/photo/photos.js.map +1 -1
- package/dist/workout/landBatch.js +2 -2
- package/dist/workout/landRunner.d.ts +1 -1
- package/dist/workout/landRunner.d.ts.map +1 -1
- package/dist/workout/landRunner.js +15 -9
- package/dist/workout/landRunner.js.map +1 -1
- package/dist/workout/xunjiRunner.js +3 -3
- package/dist/xunji/catalog.d.ts +2 -4
- package/dist/xunji/catalog.d.ts.map +1 -1
- package/dist/xunji/catalog.js +7 -11
- package/dist/xunji/catalog.js.map +1 -1
- package/dist/xunji/index.d.ts +1 -1
- package/dist/xunji/index.js +1 -1
- package/dist/xunji/rateLimit.d.ts +4 -4
- package/dist/xunji/rateLimit.d.ts.map +1 -1
- package/dist/xunji/rateLimit.js +6 -6
- package/dist/xunji/rateLimit.js.map +1 -1
- package/dist/xunji/run-sync.d.ts +1 -1
- package/dist/xunji/run-sync.js +1 -1
- package/dist/xunji/run.d.ts +1 -1
- package/dist/xunji/run.d.ts.map +1 -1
- package/package.json +3 -3
package/dist/output.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"output.d.ts","sourceRoot":"","sources":["../src/output.ts"],"names":[],"mappings":"AA6BA,OAAO,EAAmC,KAAK,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAQzF,
|
|
1
|
+
{"version":3,"file":"output.d.ts","sourceRoot":"","sources":["../src/output.ts"],"names":[],"mappings":"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"}
|
package/dist/output.js
CHANGED
|
@@ -30,12 +30,12 @@ import { basename, dirname, join, resolve } from 'node:path';
|
|
|
30
30
|
import { saveHtmlFile, helpReuseWindowOf } from 'base-paint/save-html';
|
|
31
31
|
import { CALORIE_COMBOS } from './cli/keys.js';
|
|
32
32
|
import { CalorieRenderError } from './render/errors.js';
|
|
33
|
-
import { resolveDbDir } from './paths.js';
|
|
34
|
-
import {
|
|
33
|
+
import { htmlDirOf, resolveDbDir } from './paths.js';
|
|
34
|
+
import { loadCalorieConfig } from './config.js';
|
|
35
35
|
import { HELP_FILE_STEM } from './photo/helpFile.js';
|
|
36
36
|
import { SHEET_FILE_STEM } from './photo/helpPaths.js';
|
|
37
|
-
/** HTML
|
|
38
|
-
export
|
|
37
|
+
/** HTML 产物目录名：唯一定义地＝`src/paths.ts` 的 `HTML_DIR_NAME`，本件薄转出（既有调用方导入面不变）。 */
|
|
38
|
+
export { HTML_DIR_NAME } from './paths.js';
|
|
39
39
|
export const HTML_EXT = '.html';
|
|
40
40
|
/** 照片 HELP（`calorie.help.center` 的 `q` 那支）**自己的**产物名主体：与主 HELP（`卡路里_HELP`）分名。
|
|
41
41
|
* 老命名规则里这支走的是「按 `<中文command>` 自动命名」的兜底（主体＝`看身材照`，与业务命令同名），
|
|
@@ -103,14 +103,10 @@ export function htmlFileName(command, opts) {
|
|
|
103
103
|
? command + '_' + stamp + HTML_EXT
|
|
104
104
|
: command + '_' + stamp + '_' + String(n + 1) + HTML_EXT;
|
|
105
105
|
}
|
|
106
|
-
/**
|
|
107
|
-
|
|
108
|
-
const configured = loadCalorieConfig().values.html.dir;
|
|
109
|
-
return configured !== '' ? configured : HTML_DIR_NAME;
|
|
110
|
-
}
|
|
111
|
-
/** 旧版 `html_dir()`：`<库目录>/calorie_html`（目录名可配），递归创建。 */
|
|
106
|
+
/** 旧版 `html_dir()`：`<库目录>/calorie_html`（目录名可配），递归创建。
|
|
107
|
+
* 算式唯一定义地＝`src/paths.ts` 的 `htmlDirOf`，本函数只做「读配置＋建目录」的薄壳。 */
|
|
112
108
|
export function htmlDir(dbDir = resolveDbDir()) {
|
|
113
|
-
const d =
|
|
109
|
+
const d = htmlDirOf(dbDir, loadCalorieConfig().values.html.dir);
|
|
114
110
|
mkdirSync(d, { recursive: true });
|
|
115
111
|
return d;
|
|
116
112
|
}
|
package/dist/output.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"output.js","sourceRoot":"","sources":["../src/output.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AACH,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AACjD,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAC7D,OAAO,EAAE,YAAY,EAAE,iBAAiB,EAAoB,MAAM,sBAAsB,CAAC;AACzF,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAC/C,OAAO,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AACxD,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"output.js","sourceRoot":"","sources":["../src/output.ts"],"names":[],"mappings":"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"}
|
package/dist/paths.d.ts
CHANGED
|
@@ -1,9 +1,31 @@
|
|
|
1
1
|
/** 库文件名：默认值表里的那一项就是唯一定义地（本常量是它的具名引用，不是第二份）。 */
|
|
2
2
|
export declare const DB_FILENAME: string;
|
|
3
|
-
/**
|
|
3
|
+
/** 产物目录名（`html.dir` 空串时用的默认）：同上，具名引用。 */
|
|
4
|
+
export declare const HTML_DIR_NAME: string;
|
|
5
|
+
/** 照片目录名：`photos.dir` 空串时落下 `<库目录>/photos` 的那一段（#757：空串＝按默认落点，不再是「未配置」）。 */
|
|
6
|
+
export declare const PHOTOS_DIR_NAME: "photos";
|
|
7
|
+
/** GIF 子目录名：默认值表里那一项就是唯一定义地，本常量是它的具名引用，不是第二份。 */
|
|
8
|
+
export declare const GIFS_DIR_NAME: string;
|
|
9
|
+
/** 训记状态目录名：`xunji.stateDir` 空串时落下 `<库目录>/xunji` 的那一段（#757：不再 `~/.mavis`）。 */
|
|
10
|
+
export declare const XUNJI_STATE_DIR_NAME: "xunji";
|
|
11
|
+
/** 库目录算式：`db.dir` 非空即用它，空串＝默认数据目录（默认 `~/.ilife/data/`）。
|
|
12
|
+
* 这是「面板上可改的落点」之一，写盘时那一格写成算出来的绝对路径（见 `src/config.ts`）。 */
|
|
13
|
+
export declare function dbDirOf(dataDir: string, configured: string): string;
|
|
14
|
+
/** 库目录：配置 `db.dir` 的解析结果。 */
|
|
4
15
|
export declare function resolveDbDir(): string;
|
|
5
16
|
/** 库文件名：`values.db.name` 非空即用它，空串＝`DB_FILENAME`。 */
|
|
6
17
|
export declare function resolveDbFileName(): string;
|
|
18
|
+
/** 库文件算式（目录 ＋ 文件名）。 */
|
|
19
|
+
export declare function dbFileOf(dbDir: string, name: string): string;
|
|
20
|
+
/** 产物目录算式：`<库目录>/<html.dir 值>`（空串＝默认子目录名）——设置页那一行与体检都调它。 */
|
|
21
|
+
export declare function htmlDirOf(dbDir: string, configured: string): string;
|
|
22
|
+
/** 照片目录算式：`<库目录>/<photos.dir 值>`（空串＝默认子目录名 `photos`）——#757 起空串不再是「未配置」。
|
|
23
|
+
* 设置页「照片目录」那一行（可改）与体检都调它。 */
|
|
24
|
+
export declare function photosDirOf(dbDir: string, configured: string): string;
|
|
25
|
+
/** GIF 子目录算式：`<照片目录>/<photos.gifs 值>`（空串＝默认子目录名 `gifs`）。 */
|
|
26
|
+
export declare function gifsDirOf(photosDir: string, configured: string): string;
|
|
27
|
+
/** 训记状态目录算式：`<库目录>/<xunji.stateDir 值>`（空串＝默认子目录名 `xunji`，不再 `~/.mavis`）。 */
|
|
28
|
+
export declare function stateDirOf(dbDir: string, configured: string): string;
|
|
7
29
|
export declare function resolveDbPath(filename?: string, dir?: string): string;
|
|
8
30
|
/** 测试隔离守卫：落点不在系统临时目录下即抛（不静默写生产盘）。 */
|
|
9
31
|
export declare function assertWritablePath(dbPath: string): void;
|
package/dist/paths.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"paths.d.ts","sourceRoot":"","sources":["../src/paths.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"paths.d.ts","sourceRoot":"","sources":["../src/paths.ts"],"names":[],"mappings":"AAyBA,+CAA+C;AAC/C,eAAO,MAAM,WAAW,QAAkC,CAAC;AAE3D,yCAAyC;AACzC,eAAO,MAAM,aAAa,QAAmC,CAAC;AAE9D,4EAA4E;AAC5E,eAAO,MAAM,eAAe,EAAG,QAAiB,CAAC;AAEjD,iDAAiD;AACjD,eAAO,MAAM,aAAa,QAAsC,CAAC;AAEjE,6EAA6E;AAC7E,eAAO,MAAM,oBAAoB,EAAG,OAAgB,CAAC;AAErD;0DAC0D;AAC1D,wBAAgB,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,MAAM,CAEnE;AAED,6BAA6B;AAC7B,wBAAgB,YAAY,IAAI,MAAM,CAGrC;AAED,oDAAoD;AACpD,wBAAgB,iBAAiB,IAAI,MAAM,CAG1C;AAED,uBAAuB;AACvB,wBAAgB,QAAQ,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,CAE5D;AAED,4DAA4D;AAC5D,wBAAgB,SAAS,CAAC,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,MAAM,CAEnE;AAED;8BAC8B;AAC9B,wBAAgB,WAAW,CAAC,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,MAAM,CAErE;AAED,4DAA4D;AAC5D,wBAAgB,SAAS,CAAC,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,MAAM,CAEvE;AAED,4EAA4E;AAC5E,wBAAgB,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,MAAM,CAEpE;AAED,wBAAgB,aAAa,CAAC,QAAQ,SAAsB,EAAE,GAAG,SAAiB,GAAG,MAAM,CAG1F;AAED,qCAAqC;AACrC,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAQvD"}
|
package/dist/paths.js
CHANGED
|
@@ -3,14 +3,19 @@
|
|
|
3
3
|
* #676 起库落点的**唯一真相是配置文件**（`src/config.ts` 的 `values.db`），环境变量读取已按
|
|
4
4
|
* 「配置的存与生效口径裁定」（#675）全部删除：
|
|
5
5
|
* - 库目录：`values.db.dir` 非空即用它；**空串＝按默认落点**（`loadCalorieConfig().dataDir`，
|
|
6
|
-
* 默认 `~/.ilife/data
|
|
6
|
+
* 默认 `~/.ilife/data/`，只此一处）；
|
|
7
7
|
* - 库文件名：`values.db.name`（默认件里恒非空，空串只作兜底回 `DB_FILENAME`）。
|
|
8
8
|
* 与老家的一处有意偏离保留：老家缺 `SKILLS_DB_PATH` 时静默落 `D:/.db`；TS 线改成「配置缺项即按默认
|
|
9
9
|
* 数据目录落」，绝不静默写到真实生产库里那个老路径。
|
|
10
10
|
*
|
|
11
|
+
* **#757 起本件是全部数据目录派生落点的纯算式的唯一定义地**（设置页只读行显示的那一组绝对路径由这里算，
|
|
12
|
+
* `src/photo/photos.ts` 的照片目录、`src/xunji/rateLimit.ts` 的状态目录、`src/output.ts` 的产物目录与
|
|
13
|
+
* `src/health.ts` 的体检报告都调这里，三处不许走散；面板不自己拼路径）：
|
|
14
|
+
* 算式一律是**纯函数**（只拼路径、不读配置、不碰盘），读配置只在下面几个 `resolve*` 薄壳里发生。
|
|
15
|
+
*
|
|
11
16
|
* 测试隔离守卫（`assertWritablePath`）只留「非 tmp 即抛」一条：`CALORIE_FORCE_PROD` 那个
|
|
12
17
|
* 「设一个变量就放行写任意路径」的 opt-in 已删除，**替代护栏是配置目录这个隔离基座**
|
|
13
|
-
* （`base-link-core`
|
|
18
|
+
* （`base-link-core` 的生产守卫：测试跑在 `node --test` 里却要落到真实家目录就直接响亮报错，
|
|
14
19
|
* 不会落到真实家目录）。守卫自己仍按 tmp 收敛落点，挡住「不小心写到真盘」这类手滑。
|
|
15
20
|
*/
|
|
16
21
|
import { mkdirSync } from 'node:fs';
|
|
@@ -19,17 +24,50 @@ import { join, resolve } from 'node:path';
|
|
|
19
24
|
import { CALORIE_CONFIG_DEFAULTS, loadCalorieConfig } from './config.js';
|
|
20
25
|
/** 库文件名：默认值表里的那一项就是唯一定义地（本常量是它的具名引用，不是第二份）。 */
|
|
21
26
|
export const DB_FILENAME = CALORIE_CONFIG_DEFAULTS.db.name;
|
|
22
|
-
/**
|
|
27
|
+
/** 产物目录名（`html.dir` 空串时用的默认）：同上，具名引用。 */
|
|
28
|
+
export const HTML_DIR_NAME = CALORIE_CONFIG_DEFAULTS.html.dir;
|
|
29
|
+
/** 照片目录名：`photos.dir` 空串时落下 `<库目录>/photos` 的那一段（#757：空串＝按默认落点，不再是「未配置」）。 */
|
|
30
|
+
export const PHOTOS_DIR_NAME = 'photos';
|
|
31
|
+
/** GIF 子目录名：默认值表里那一项就是唯一定义地，本常量是它的具名引用，不是第二份。 */
|
|
32
|
+
export const GIFS_DIR_NAME = CALORIE_CONFIG_DEFAULTS.photos.gifs;
|
|
33
|
+
/** 训记状态目录名：`xunji.stateDir` 空串时落下 `<库目录>/xunji` 的那一段（#757：不再 `~/.mavis`）。 */
|
|
34
|
+
export const XUNJI_STATE_DIR_NAME = 'xunji';
|
|
35
|
+
/** 库目录算式：`db.dir` 非空即用它，空串＝默认数据目录（默认 `~/.ilife/data/`）。
|
|
36
|
+
* 这是「面板上可改的落点」之一，写盘时那一格写成算出来的绝对路径（见 `src/config.ts`）。 */
|
|
37
|
+
export function dbDirOf(dataDir, configured) {
|
|
38
|
+
return configured !== '' ? configured : dataDir;
|
|
39
|
+
}
|
|
40
|
+
/** 库目录：配置 `db.dir` 的解析结果。 */
|
|
23
41
|
export function resolveDbDir() {
|
|
24
42
|
const cfg = loadCalorieConfig();
|
|
25
|
-
|
|
26
|
-
return configured !== '' ? configured : cfg.dataDir;
|
|
43
|
+
return dbDirOf(cfg.dataDir, cfg.values.db.dir);
|
|
27
44
|
}
|
|
28
45
|
/** 库文件名：`values.db.name` 非空即用它，空串＝`DB_FILENAME`。 */
|
|
29
46
|
export function resolveDbFileName() {
|
|
30
47
|
const name = loadCalorieConfig().values.db.name;
|
|
31
48
|
return name !== '' ? name : DB_FILENAME;
|
|
32
49
|
}
|
|
50
|
+
/** 库文件算式（目录 ＋ 文件名）。 */
|
|
51
|
+
export function dbFileOf(dbDir, name) {
|
|
52
|
+
return join(dbDir, name !== '' ? name : DB_FILENAME);
|
|
53
|
+
}
|
|
54
|
+
/** 产物目录算式：`<库目录>/<html.dir 值>`（空串＝默认子目录名）——设置页那一行与体检都调它。 */
|
|
55
|
+
export function htmlDirOf(dbDir, configured) {
|
|
56
|
+
return join(dbDir, configured !== '' ? configured : HTML_DIR_NAME);
|
|
57
|
+
}
|
|
58
|
+
/** 照片目录算式：`<库目录>/<photos.dir 值>`（空串＝默认子目录名 `photos`）——#757 起空串不再是「未配置」。
|
|
59
|
+
* 设置页「照片目录」那一行（可改）与体检都调它。 */
|
|
60
|
+
export function photosDirOf(dbDir, configured) {
|
|
61
|
+
return configured !== '' ? configured : join(dbDir, PHOTOS_DIR_NAME);
|
|
62
|
+
}
|
|
63
|
+
/** GIF 子目录算式：`<照片目录>/<photos.gifs 值>`（空串＝默认子目录名 `gifs`）。 */
|
|
64
|
+
export function gifsDirOf(photosDir, configured) {
|
|
65
|
+
return join(photosDir, configured !== '' ? configured : GIFS_DIR_NAME);
|
|
66
|
+
}
|
|
67
|
+
/** 训记状态目录算式：`<库目录>/<xunji.stateDir 值>`（空串＝默认子目录名 `xunji`，不再 `~/.mavis`）。 */
|
|
68
|
+
export function stateDirOf(dbDir, configured) {
|
|
69
|
+
return configured !== '' ? configured : join(dbDir, XUNJI_STATE_DIR_NAME);
|
|
70
|
+
}
|
|
33
71
|
export function resolveDbPath(filename = resolveDbFileName(), dir = resolveDbDir()) {
|
|
34
72
|
mkdirSync(dir, { recursive: true });
|
|
35
73
|
return join(dir, filename);
|
|
@@ -39,7 +77,7 @@ export function assertWritablePath(dbPath) {
|
|
|
39
77
|
const underTmp = resolve(dbPath).startsWith(resolve(tmpdir()));
|
|
40
78
|
if (!underTmp) {
|
|
41
79
|
throw new Error(`[skill-calorie] 拒绝写入非 tmp 路径 ${dbPath}：测试隔离守卫。` +
|
|
42
|
-
'落点要挪，请改配置文件里的 db.dir
|
|
80
|
+
'落点要挪，请改配置文件里的 db.dir（测试把家目录指到临时目录）。');
|
|
43
81
|
}
|
|
44
82
|
}
|
|
45
83
|
//# sourceMappingURL=paths.js.map
|
package/dist/paths.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"paths.js","sourceRoot":"","sources":["../src/paths.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"paths.js","sourceRoot":"","sources":["../src/paths.ts"],"names":[],"mappings":"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"}
|
package/dist/photo/dir.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/** 读侧口径：显式参数 > 配置文件 `photos.dir`；都没有即 `undefined`（视图照常出，只是不校验文件存在性）。 */
|
|
2
2
|
export declare function photoDir(params: Record<string, unknown>): string | undefined;
|
|
3
|
-
/**
|
|
3
|
+
/** 写侧口径：同上取值，缺省落默认目录 `<库目录>/photos`（#757：空串不再抛，「未配置」状态消失）。 */
|
|
4
4
|
export declare function photoDirOrThrow(params: Record<string, unknown>): string;
|
|
5
5
|
//# sourceMappingURL=dir.d.ts.map
|
package/dist/photo/dir.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dir.d.ts","sourceRoot":"","sources":["../../src/photo/dir.ts"],"names":[],"mappings":"AAWA,wEAAwE;AACxE,wBAAgB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,GAAG,SAAS,CAK5E;AAED,
|
|
1
|
+
{"version":3,"file":"dir.d.ts","sourceRoot":"","sources":["../../src/photo/dir.ts"],"names":[],"mappings":"AAWA,wEAAwE;AACxE,wBAAgB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,GAAG,SAAS,CAK5E;AAED,8DAA8D;AAC9D,wBAAgB,eAAe,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAEvE"}
|
package/dist/photo/dir.js
CHANGED
|
@@ -16,7 +16,7 @@ export function photoDir(params) {
|
|
|
16
16
|
const e = configuredPhotosDir();
|
|
17
17
|
return e !== '' ? e : undefined;
|
|
18
18
|
}
|
|
19
|
-
/**
|
|
19
|
+
/** 写侧口径：同上取值，缺省落默认目录 `<库目录>/photos`（#757：空串不再抛，「未配置」状态消失）。 */
|
|
20
20
|
export function photoDirOrThrow(params) {
|
|
21
21
|
return resolvePhotosDir(photoDir(params) ?? null);
|
|
22
22
|
}
|
package/dist/photo/dir.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dir.js","sourceRoot":"","sources":["../../src/photo/dir.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AACH,OAAO,EAAE,mBAAmB,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AACpE,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAE7C,wEAAwE;AACxE,MAAM,UAAU,QAAQ,CAAC,MAA+B;IACtD,MAAM,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;IACtC,IAAI,CAAC;QAAE,OAAO,CAAC,CAAC;IAChB,MAAM,CAAC,GAAG,mBAAmB,EAAE,CAAC;IAChC,OAAO,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;AAClC,CAAC;AAED,
|
|
1
|
+
{"version":3,"file":"dir.js","sourceRoot":"","sources":["../../src/photo/dir.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AACH,OAAO,EAAE,mBAAmB,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AACpE,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAE7C,wEAAwE;AACxE,MAAM,UAAU,QAAQ,CAAC,MAA+B;IACtD,MAAM,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;IACtC,IAAI,CAAC;QAAE,OAAO,CAAC,CAAC;IAChB,MAAM,CAAC,GAAG,mBAAmB,EAAE,CAAC;IAChC,OAAO,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;AAClC,CAAC;AAED,8DAA8D;AAC9D,MAAM,UAAU,eAAe,CAAC,MAA+B;IAC7D,OAAO,gBAAgB,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,IAAI,CAAC,CAAC;AACpD,CAAC"}
|
package/dist/photo/photos.d.ts
CHANGED
|
@@ -14,9 +14,10 @@ export declare function serializeTags(tags: string[]): string;
|
|
|
14
14
|
/** 硬规则：非空 + 单个 ≤20 + 数量 ≤10（非法即抛）。 */
|
|
15
15
|
export declare function validateTags(tags: string[]): string[];
|
|
16
16
|
export declare function tagsContain(tagStr: string | null | undefined, tag: string): boolean;
|
|
17
|
-
/** 配置里的照片目录（**唯一真相**：`calorie.yaml` 的 `photos.dir
|
|
17
|
+
/** 配置里的照片目录（**唯一真相**：`calorie.yaml` 的 `photos.dir`；空串＝按默认落点 `<数据目录>/photos`，#757 起不再是「未配置」）。 */
|
|
18
18
|
export declare function configuredPhotosDir(): string;
|
|
19
|
-
/** 照片目录解析：显式传参 > 配置文件 `photos.dir
|
|
19
|
+
/** 照片目录解析：显式传参 > 配置文件 `photos.dir` > 默认落点 `<库目录>/photos`（#757：空串不再抛）。
|
|
20
|
+
* 算式唯一定义地＝`src/paths.ts` 的 `photosDirOf`，本函数只做「读配置＋建目录」的薄壳。 */
|
|
20
21
|
export declare function resolvePhotosDir(dir?: string | null): string;
|
|
21
22
|
export interface PhotoRow {
|
|
22
23
|
id: number;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"photos.d.ts","sourceRoot":"","sources":["../../src/photo/photos.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"photos.d.ts","sourceRoot":"","sources":["../../src/photo/photos.ts"],"names":[],"mappings":"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"}
|
package/dist/photo/photos.js
CHANGED
|
@@ -2,6 +2,7 @@ import { cpSync, existsSync, mkdirSync, rmSync } from 'node:fs';
|
|
|
2
2
|
import { basename, join, resolve } from 'node:path';
|
|
3
3
|
import { FetchError } from '../fetch/errors.js';
|
|
4
4
|
import { loadCalorieConfig } from '../config.js';
|
|
5
|
+
import { photosDirOf, resolveDbDir } from '../paths.js';
|
|
5
6
|
import { shiftISODate, timeOfDayISO, todayISO } from '../shared/time.js';
|
|
6
7
|
export const TAG_SEP = ',';
|
|
7
8
|
export const TAG_MAX_LEN = 20;
|
|
@@ -37,19 +38,17 @@ export function validateTags(tags) {
|
|
|
37
38
|
export function tagsContain(tagStr, tag) {
|
|
38
39
|
return parseTags(tagStr).includes(tag);
|
|
39
40
|
}
|
|
40
|
-
/** 配置里的照片目录（**唯一真相**：`calorie.yaml` 的 `photos.dir
|
|
41
|
+
/** 配置里的照片目录（**唯一真相**：`calorie.yaml` 的 `photos.dir`；空串＝按默认落点 `<数据目录>/photos`，#757 起不再是「未配置」）。 */
|
|
41
42
|
export function configuredPhotosDir() {
|
|
42
43
|
return loadCalorieConfig().values.photos.dir;
|
|
43
44
|
}
|
|
44
|
-
/** 照片目录解析：显式传参 > 配置文件 `photos.dir
|
|
45
|
+
/** 照片目录解析：显式传参 > 配置文件 `photos.dir` > 默认落点 `<库目录>/photos`（#757：空串不再抛）。
|
|
46
|
+
* 算式唯一定义地＝`src/paths.ts` 的 `photosDirOf`，本函数只做「读配置＋建目录」的薄壳。 */
|
|
45
47
|
export function resolvePhotosDir(dir) {
|
|
46
48
|
const raw = (dir ?? configuredPhotosDir()).trim();
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
}
|
|
51
|
-
mkdirSync(raw, { recursive: true });
|
|
52
|
-
return resolve(raw);
|
|
49
|
+
const resolved = raw !== '' ? raw : photosDirOf(resolveDbDir(), '');
|
|
50
|
+
mkdirSync(resolved, { recursive: true });
|
|
51
|
+
return resolve(resolved);
|
|
53
52
|
}
|
|
54
53
|
const PHOTO_COLS = 'id, date, time, photo_path, tag, note, created_at';
|
|
55
54
|
function toRow(r) {
|
package/dist/photo/photos.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"photos.js","sourceRoot":"","sources":["../../src/photo/photos.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AAChE,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpD,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAChD,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AACjD,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAEzE,MAAM,CAAC,MAAM,OAAO,GAAG,GAAG,CAAC;AAC3B,MAAM,CAAC,MAAM,WAAW,GAAG,EAAE,CAAC;AAC9B,MAAM,CAAC,MAAM,aAAa,GAAG,EAAE,CAAC;AAEhC,6CAA6C;AAC7C,MAAM,UAAU,SAAS,CAAC,MAAiC;IACzD,MAAM,IAAI,GAAG,IAAI,GAAG,EAAU,CAAC;IAC/B,MAAM,GAAG,GAAa,EAAE,CAAC;IACzB,KAAK,MAAM,CAAC,IAAI,MAAM,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC;QACpD,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC;QACnB,IAAI,CAAC,CAAC,IAAI,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;YAAE,SAAS;QAChC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;QACZ,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IACd,CAAC;IACD,OAAO,GAAG,CAAC;AACb,CAAC;AAED,MAAM,UAAU,aAAa,CAAC,IAAc;IAC1C,OAAO,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;AAC5B,CAAC;AAED,sCAAsC;AACtC,MAAM,UAAU,YAAY,CAAC,IAAc;IACzC,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC;QAAE,MAAM,IAAI,UAAU,CAAC,aAAa,CAAC,CAAC;IAC3D,KAAK,MAAM,CAAC,IAAI,IAAI,EAAE,CAAC;QACrB,IAAI,CAAC,CAAC,MAAM,GAAG,WAAW;YAAE,MAAM,IAAI,UAAU,CAAC,OAAO,GAAG,CAAC,CAAC,MAAM,GAAG,KAAK,GAAG,WAAW,GAAG,KAAK,GAAG,CAAC,CAAC,CAAC;IACzG,CAAC;IACD,IAAI,IAAI,CAAC,MAAM,GAAG,aAAa;QAAE,MAAM,IAAI,UAAU,CAAC,SAAS,GAAG,IAAI,CAAC,MAAM,GAAG,KAAK,GAAG,aAAa,GAAG,GAAG,CAAC,CAAC;IAC7G,OAAO,IAAI,CAAC;AACd,CAAC;AAED,MAAM,UAAU,WAAW,CAAC,MAAiC,EAAE,GAAW;IACxE,OAAO,SAAS,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;AACzC,CAAC;AAED,
|
|
1
|
+
{"version":3,"file":"photos.js","sourceRoot":"","sources":["../../src/photo/photos.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,8 +15,8 @@
|
|
|
15
15
|
* - 缺省 → 结果页（逐天结局 ＋ 推送回写天数 ＋ 本地远端分清）。
|
|
16
16
|
*
|
|
17
17
|
* 挡板缝（#676 已退役）：原先的 `CALORIE_LAND_BATCH_FAIL_DATE` 短路（某天强制失败）与单日四路
|
|
18
|
-
* `CALORIE_LAND_*_STUB`
|
|
19
|
-
*
|
|
18
|
+
* `CALORIE_LAND_*_STUB` 环境变量读取全部删除（配置文件是唯一真相）。#757 起跨技能两出口删键，
|
|
19
|
+
* 测试不再经配置指 fixture：训记两步走 `xunji.cli` 页外键，跨技能两步走真实兄弟包（家目录注入隔离）。
|
|
20
20
|
*/
|
|
21
21
|
import { spawnSync } from 'node:child_process';
|
|
22
22
|
import { existsSync } from 'node:fs';
|
|
@@ -14,7 +14,7 @@ export interface LandCall {
|
|
|
14
14
|
readonly stderr: string;
|
|
15
15
|
readonly stubbed: boolean;
|
|
16
16
|
}
|
|
17
|
-
/**
|
|
17
|
+
/** 作息统一出口（编译产物；按包布局算）。 */
|
|
18
18
|
export declare function scheduleCliPath(): string;
|
|
19
19
|
/** 备忘统一出口（同上）。 */
|
|
20
20
|
export declare function memoCliPath(): string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"landRunner.d.ts","sourceRoot":"","sources":["../../src/workout/landRunner.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"landRunner.d.ts","sourceRoot":"","sources":["../../src/workout/landRunner.ts"],"names":[],"mappings":"AA8BA,OAAO,EAAe,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAC/D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAElD,OAAO,EAAE,cAAc,EAAE,CAAC;AAC1B,YAAY,EAAE,SAAS,EAAE,CAAC;AAE1B;yDACyD;AACzD,eAAO,MAAM,qBAAqB,QAAkD,CAAC;AAErF,kDAAkD;AAClD,wBAAgB,kBAAkB,IAAI,MAAM,CAG3C;AAED,wEAAwE;AACxE,MAAM,WAAW,QAAQ;IACvB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC;IACvB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;CAC3B;AAeD,0BAA0B;AAC1B,wBAAgB,eAAe,IAAI,MAAM,CAKxC;AAED,kBAAkB;AAClB,wBAAgB,WAAW,IAAI,MAAM,CAKpC;AA4DD,uEAAuE;AACvE,wBAAgB,cAAc,CAC5B,KAAK,EAAE,SAAS;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,EAAE,EACvG,IAAI,EAAE,MAAM,GACX,QAAQ,CAGV;AAED,8DAA8D;AAC9D,wBAAgB,UAAU,CACxB,KAAK,EAAE;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,EAC5E,IAAI,EAAE,MAAM,GACX,QAAQ,CAGV;AAED,yCAAyC;AACzC,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,SAAS,CAEpE;AAED,yEAAyE;AACzE,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,SAAS,CAEvE"}
|
|
@@ -15,6 +15,12 @@
|
|
|
15
15
|
* - 限时：`land.landSeconds`（毫秒换算在本件做），空／坏值回落默认档；
|
|
16
16
|
* - 挡板缝（原先四个 `CALORIE_LAND_*_STUB` 环境变量）**已退役**：读取删除，`stubbed` 恒 false。
|
|
17
17
|
* 测试要挡板就把上面两个出口指到一个 fixture 脚本，让它吐出原来挡板吐的那份回执。
|
|
18
|
+
*
|
|
19
|
+
* #757 · 两个出口删键（#748 定稿）：`land.scheduleCli`／`land.memoCli` 从默认值表出表，
|
|
20
|
+
* 老文件里的残留由 `CALORIE_CONFIG_RETIRED` 容忍（读跳过、不进取值、写即清）。
|
|
21
|
+
* 出口退回「按包布局推断」——本件不再读配置，只按包布局算（测试缝替代通道见下）。
|
|
22
|
+
* 测试要挡板走 `xunji.cli` 那个页外键（训记两步仍可指到 fixture）；跨技能两步（作息／备忘）在测试里
|
|
23
|
+
* 走真实兄弟包（家目录注入下它们读写临时家目录，不碰真实数据），不再经配置指到 fixture。
|
|
18
24
|
*/
|
|
19
25
|
import { spawnSync } from 'node:child_process';
|
|
20
26
|
import { existsSync } from 'node:fs';
|
|
@@ -32,25 +38,25 @@ export function landSpawnTimeoutMs() {
|
|
|
32
38
|
const seconds = loadCalorieConfig().values.land.landSeconds;
|
|
33
39
|
return (seconds >= 1 ? seconds : CALORIE_CONFIG_DEFAULTS.land.landSeconds) * 1000;
|
|
34
40
|
}
|
|
35
|
-
/**
|
|
41
|
+
/** 跨技能出口的取值：按包布局算（#757 起不再读配置；老键已退休）。
|
|
36
42
|
*
|
|
37
|
-
*
|
|
38
|
-
*
|
|
39
|
-
function crossSkillCliPath(
|
|
40
|
-
const cli =
|
|
43
|
+
* 「谁在取」这一处是**唯一**的取值点：两个出口（作息／备忘）都走它，
|
|
44
|
+
* 于是「出口在哪」只有一个定义地。 */
|
|
45
|
+
function crossSkillCliPath(relative, label) {
|
|
46
|
+
const cli = join(dirname(fileURLToPath(import.meta.url)), ...relative);
|
|
41
47
|
if (!existsSync(cli)) {
|
|
42
48
|
fail(4, label + '出口不在（' + cli + '）：先跑对应包的构建再调本命令；'
|
|
43
|
-
+ '
|
|
49
|
+
+ '出口按包布局推断（设置页已不再提供这一项，见 #748 定稿）。');
|
|
44
50
|
}
|
|
45
51
|
return cli;
|
|
46
52
|
}
|
|
47
|
-
/**
|
|
53
|
+
/** 作息统一出口（编译产物；按包布局算）。 */
|
|
48
54
|
export function scheduleCliPath() {
|
|
49
|
-
return crossSkillCliPath(
|
|
55
|
+
return crossSkillCliPath(['..', '..', '..', 'skill-schedule', 'dist', 'cli', 'cmd_read.js'], '作息');
|
|
50
56
|
}
|
|
51
57
|
/** 备忘统一出口（同上）。 */
|
|
52
58
|
export function memoCliPath() {
|
|
53
|
-
return crossSkillCliPath(
|
|
59
|
+
return crossSkillCliPath(['..', '..', '..', 'skill-memo-ilife', 'dist', 'cli', 'cmd_read.js'], '备忘');
|
|
54
60
|
}
|
|
55
61
|
/** stderr 尾行（失败点名用；截 300 字，空即 ''）。 */
|
|
56
62
|
function stderrTail(r) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"landRunner.js","sourceRoot":"","sources":["../../src/workout/landRunner.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"landRunner.js","sourceRoot":"","sources":["../../src/workout/landRunner.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,9 +12,9 @@
|
|
|
12
12
|
* 页上读数一律来自本次调用的 stdout JSON，不读外部预制的 `--results-json`。
|
|
13
13
|
*
|
|
14
14
|
* 挡板缝（#676 已退役）：原先由环境变量 `CALORIE_XUNJI_STUB` 短路，现已删除（配置文件是唯一真相）。
|
|
15
|
-
*
|
|
16
|
-
*
|
|
17
|
-
*
|
|
15
|
+
* 测试要挡板把**训记入口**（配置里的 `xunji.cli`，见 `config.ts` 的「页外键」注）指到 fixture 脚本，
|
|
16
|
+
* 让它吐出原来挡板吐的那份回执——外调留这一个配置口，不再有读环境变量的隐式缝。
|
|
17
|
+
* （#757 起跨技能两出口删键：作息／备忘两步走真实兄弟包，不再经配置指 fixture。）
|
|
18
18
|
*/
|
|
19
19
|
import { spawnSync } from 'node:child_process';
|
|
20
20
|
import { existsSync } from 'node:fs';
|
package/dist/xunji/catalog.d.ts
CHANGED
|
@@ -1,10 +1,8 @@
|
|
|
1
|
-
/**
|
|
1
|
+
/** 库路径的**唯一定义地**（#757 起只剩包内预置快照这一档；老机器路径已退场）。 */
|
|
2
2
|
export declare const XUNJI_CATALOG: {
|
|
3
|
-
/**
|
|
3
|
+
/** 默认：包内预置快照（模块自己的数据件）。`tsc` **不复制资源**（`tooling/check-publish.mjs:10`
|
|
4
4
|
* 「只靠 files 随包发」），故按**源布局**定位；安装态读不读得到由发件清单决定（#601 那一票）。 */
|
|
5
5
|
readonly preset: string;
|
|
6
|
-
/** ② 显式覆盖：老的机器路径（只作**可传的一个值**，模块不隐式读它）。 */
|
|
7
|
-
readonly machine: string;
|
|
8
6
|
};
|
|
9
7
|
/** 库来源的缺省落点：配置里 `xunji.catalog` 非空即用它，空串＝包内预置快照（#676 起配置是唯一真相）。 */
|
|
10
8
|
export declare function defaultCatalogPath(): string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"catalog.d.ts","sourceRoot":"","sources":["../../src/xunji/catalog.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"catalog.d.ts","sourceRoot":"","sources":["../../src/xunji/catalog.ts"],"names":[],"mappings":"AAsBA,iDAAiD;AACjD,eAAO,MAAM,aAAa;IACxB;iEAC6D;;CAErD,CAAC;AAEX,mEAAmE;AACnE,wBAAgB,kBAAkB,IAAI,MAAM,CAG3C;AAED,2DAA2D;AAC3D,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,oDAAoD;IACpD,MAAM,EAAE,OAAO,CAAC;IAChB,2BAA2B;IAC3B,KAAK,EAAE,SAAS,MAAM,EAAE,CAAC;IACzB,2CAA2C;IAC3C,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;CACvB;AAED,2CAA2C;AAC3C,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,qDAAqD;IACrD,KAAK,EAAE,OAAO,GAAG,IAAI,CAAC;IACtB,cAAc,EAAE,OAAO,CAAC;IACxB,sDAAsD;IACtD,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,8BAA8B;IAC9B,WAAW,EAAE,SAAS,MAAM,EAAE,CAAC;CAChC;AAED,gDAAgD;AAChD,MAAM,WAAW,oBAAoB;IACnC,cAAc,EAAE,OAAO,CAAC;IACxB,YAAY,EAAE,MAAM,CAAC;IACrB,+BAA+B;IAC/B,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,EAAE,MAAM,CAAC;IACpB,aAAa,EAAE,MAAM,CAAC;IACtB,kBAAkB,EAAE,MAAM,CAAC;IAC3B,OAAO,EAAE,SAAS,eAAe,EAAE,CAAC;CACrC;AAED,0DAA0D;AAC1D,MAAM,WAAW,aAAa;IAC5B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,CAAC,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;CAC/B;AAeD,yFAAyF;AACzF,wBAAgB,mBAAmB,CAAC,IAAI,GAAE,MAA6B,GAAG,WAAW,CAwBpF;AAmBD,0CAA0C;AAC1C,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,CAAC,MAAM,CAAC,EAAE,IAAI,SAAI,GAAG,MAAM,EAAE,CAgBxF;AAiBD,gDAAgD;AAChD,wBAAgB,eAAe,CAAC,KAAK,EAAE,SAAS,MAAM,EAAE,EAAE,IAAI,GAAE,aAAkB,GAAG,oBAAoB,CAaxG"}
|
package/dist/xunji/catalog.js
CHANGED
|
@@ -6,27 +6,23 @@
|
|
|
6
6
|
* 读不出来（文件不在／解析失败／`actions` 不是数组）＝「库缺失」，**不是「库是空的」**：
|
|
7
7
|
* 调用方按「无法验证」报（`valid: null`），不许当成「动作不合法」（老 `catalog.py:44-89` 同口径）。
|
|
8
8
|
*
|
|
9
|
-
*
|
|
10
|
-
*
|
|
11
|
-
*
|
|
12
|
-
*
|
|
13
|
-
*
|
|
14
|
-
* **模块不隐式读机器路径**：那会让「这台机器放没放库」变成第二套口径，与编辑器库面（吃预置库）分叉。
|
|
9
|
+
* 库路径（#606 票内定的口径，见证据件 §三；#676 起默认档改成读配置；#757 起老机器路径退场）：
|
|
10
|
+
* **默认**＝配置里的 `xunji.catalog`；空串时回落到包内预置快照 `src/xunji/data/训记官方动作.json`
|
|
11
|
+
* （`XUNJI_CATALOG.preset`）——同一句动作名在任何一台机器上算出同一个结果；
|
|
12
|
+
* **显式覆盖**＝调用方把一条路径传进来（子命令读法 `verify --catalog <路径>`）。
|
|
13
|
+
* **模块不隐式读机器路径**。
|
|
15
14
|
*/
|
|
16
|
-
import { homedir } from 'node:os';
|
|
17
15
|
import { dirname, join, resolve } from 'node:path';
|
|
18
16
|
import { fileURLToPath } from 'node:url';
|
|
19
17
|
import { readFileSync } from 'node:fs';
|
|
20
18
|
import { loadCalorieConfig } from '../config.js';
|
|
21
19
|
/** 包根：本模块往上两级（源码态 `src/xunji` 与构建态 `dist/xunji` 都成立，与渲染层模板装载器同法）。 */
|
|
22
20
|
const PACKAGE_ROOT = resolve(dirname(fileURLToPath(import.meta.url)), '..', '..');
|
|
23
|
-
/**
|
|
21
|
+
/** 库路径的**唯一定义地**（#757 起只剩包内预置快照这一档；老机器路径已退场）。 */
|
|
24
22
|
export const XUNJI_CATALOG = {
|
|
25
|
-
/**
|
|
23
|
+
/** 默认：包内预置快照（模块自己的数据件）。`tsc` **不复制资源**（`tooling/check-publish.mjs:10`
|
|
26
24
|
* 「只靠 files 随包发」），故按**源布局**定位；安装态读不读得到由发件清单决定（#601 那一票）。 */
|
|
27
25
|
preset: join(PACKAGE_ROOT, 'src', 'xunji', 'data', '训记官方动作.json'),
|
|
28
|
-
/** ② 显式覆盖：老的机器路径（只作**可传的一个值**，模块不隐式读它）。 */
|
|
29
|
-
machine: join(homedir(), '.minimax', '训记官方动作.json'),
|
|
30
26
|
};
|
|
31
27
|
/** 库来源的缺省落点：配置里 `xunji.catalog` 非空即用它，空串＝包内预置快照（#676 起配置是唯一真相）。 */
|
|
32
28
|
export function defaultCatalogPath() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"catalog.js","sourceRoot":"","sources":["../../src/xunji/catalog.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"catalog.js","sourceRoot":"","sources":["../../src/xunji/catalog.ts"],"names":[],"mappings":"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"}
|
package/dist/xunji/index.d.ts
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
*
|
|
3
3
|
* 对外给**五件**（别的能力或命令用它，只经这五件）：
|
|
4
4
|
* ① `XUNJI_SUBCOMMANDS` —— 8 条子命令的对外面（名字／用法／参数／退出码／实现状态／归属票，唯一定义地）；
|
|
5
|
-
* ② `XUNJI_CATALOG` ——
|
|
5
|
+
* ② `XUNJI_CATALOG` —— 动作库路径（包内预置快照；#757 起老机器路径已退场）；
|
|
6
6
|
* ③ `readMovementCatalog` —— 读库（读到什么／为什么读不到，缺文件不抛错）；
|
|
7
7
|
* ④ `verifyMovements` —— 动作名校验（老三态 valid／false／null ＋ 库缺失的明确读数）；
|
|
8
8
|
* ⑤ `runXunjiCommand` —— 按声明分派一条子命令（本票只有 `verify` 真跑）。
|