skill-calorie 0.2.6 → 0.3.1
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 +17 -13
- 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 +1 -1
|
@@ -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":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC/C,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACrC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAC1C,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AACzC,OAAO,EAAE,uBAAuB,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAC1E,OAAO,EAAE,IAAI,EAAE,MAAM,qBAAqB,CAAC;AAC3C,OAAO,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAG/D,OAAO,EAAE,cAAc,EAAE,CAAC;AAG1B;yDACyD;AACzD,MAAM,CAAC,MAAM,qBAAqB,GAAG,uBAAuB,CAAC,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC;AAErF,kDAAkD;AAClD,MAAM,UAAU,kBAAkB;IAChC,MAAM,OAAO,GAAG,iBAAiB,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC;IAC5D,OAAO,CAAC,OAAO,IAAI,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,uBAAuB,CAAC,IAAI,CAAC,WAAW,CAAC,GAAG,IAAI,CAAC;AACpF,CAAC;AAUD;;;uBAGuB;AACvB,SAAS,iBAAiB,CAAC,QAA2B,EAAE,KAAa;IACnE,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,GAAG,QAAQ,CAAC,CAAC;IACvE,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;QACrB,IAAI,CAAC,CAAC,EAAE,KAAK,GAAG,OAAO,GAAG,GAAG,GAAG,kBAAkB;cAC9C,kCAAkC,CAAC,CAAC;IAC1C,CAAC;IACD,OAAO,GAAG,CAAC;AACb,CAAC;AAED,0BAA0B;AAC1B,MAAM,UAAU,eAAe;IAC7B,OAAO,iBAAiB,CACtB,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,gBAAgB,EAAE,MAAM,EAAE,KAAK,EAAE,aAAa,CAAC,EAClE,IAAI,CACL,CAAC;AACJ,CAAC;AAED,kBAAkB;AAClB,MAAM,UAAU,WAAW;IACzB,OAAO,iBAAiB,CACtB,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,kBAAkB,EAAE,MAAM,EAAE,KAAK,EAAE,aAAa,CAAC,EACpE,IAAI,CACL,CAAC;AACJ,CAAC;AAED,sCAAsC;AACtC,SAAS,UAAU,CAAC,CAAuB;IACzC,MAAM,KAAK,GAAG,MAAM,CAAC,CAAC,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC;IAC9F,MAAM,IAAI,GAAG,KAAK,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAE,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAY,CAAC;IAC3E,OAAO,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;AAC5B,CAAC;AAED,gEAAgE;AAChE,SAAS,YAAY,CAAC,IAAY,EAAE,IAAY,EAAE,GAAW;IAC3D,IAAI,MAAe,CAAC;IACpB,IAAI,CAAC;QACH,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAC5B,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,IAAI,CAAC,CAAC,EAAE,IAAI,GAAG,SAAS,GAAG,GAAG,GAAG,qBAAqB,GAAG,CAAC,CAAC,YAAY,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IACzG,CAAC;IACD,MAAM,CAAC,GAAG,MAAmC,CAAC;IAC9C,IAAI,OAAO,CAAC,KAAK,QAAQ,IAAI,CAAC,KAAK,IAAI,IAAI,OAAQ,CAAwB,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;QAC9F,IAAI,CAAC,CAAC,EAAE,IAAI,GAAG,SAAS,GAAG,GAAG,GAAG,qBAAqB,CAAC,CAAC;IAC1D,CAAC;IACD,OAAQ,CAAuB,CAAC,IAAI,CAAC;AACvC,CAAC;AAED;oDACoD;AACpD,SAAS,WAAW,CAAC,GAAW,EAAE,GAAW,EAAE,MAA+B,EAAE,IAAY;IAC1F,MAAM,SAAS,GAAG,kBAAkB,EAAE,CAAC;IACvC,MAAM,CAAC,GAAG,SAAS,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,UAAU,EAAE,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,EAAE;QACpF,QAAQ,EAAE,MAAM;QAChB,OAAO,EAAE,SAAS;KACnB,CAAC,CAAC;IACH,MAAM,GAAG,GAAI,CAAyB,CAAC,KAAK,CAAC;IAC7C,IAAI,GAAG,KAAK,SAAS,IAAI,GAAG,KAAK,IAAI,EAAE,CAAC;QACtC,MAAM,GAAG,GAAG,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QAC7D,IAAI,CAAC,CAAC,EAAE,IAAI,GAAG,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,SAAS,GAAG,IAAI,CAAC,GAAG,MAAM,GAAG,GAAG,CAAC,CAAC;IAC5E,CAAC;IACD,MAAM,IAAI,GAAG,OAAO,CAAC,CAAC,MAAM,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;IACzD,MAAM,IAAI,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC;IAC3B,MAAM,IAAI,GAAG,MAAM,CAAC,CAAC,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;IAC3C,IAAI,IAAI,KAAK,EAAE,EAAE,CAAC;QAChB,IAAI,IAAI,KAAK,CAAC;YAAE,IAAI,CAAC,CAAC,EAAE,IAAI,GAAG,SAAS,GAAG,GAAG,GAAG,mBAAmB,CAAC,CAAC;QACtE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;IAC5D,CAAC;IACD,IAAI,IAAI,GAAY,IAAI,CAAC;IACzB,IAAI,CAAC;QACH,IAAI,GAAG,YAAY,CAAC,IAAI,EAAE,IAAI,EAAE,GAAG,CAAC,CAAC;IACvC,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,IAAI,IAAI,KAAK,CAAC;YAAE,MAAM,CAAC,CAAC;QACxB,IAAI,CAAC;YACH,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAC1B,CAAC;QAAC,MAAM,CAAC;YACP,IAAI,GAAG,IAAI,CAAC;QACd,CAAC;QACD,MAAM,KAAK,GAAI,IAAkC,CAAC;QAClD,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,IAAI,MAAM,IAAI,KAAK;YAAE,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC;IACxF,CAAC;IACD,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;AACtD,CAAC;AAED,uEAAuE;AACvE,MAAM,UAAU,cAAc,CAC5B,KAAuG,EACvG,IAAY;IAEZ,MAAM,GAAG,GAAG,eAAe,EAAE,CAAC;IAC9B,OAAO,WAAW,CAAC,GAAG,EAAE,qBAAqB,EAAE,EAAE,EAAE,EAAE,QAAQ,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,IAAI,CAAC,CAAC;AACvF,CAAC;AAED,8DAA8D;AAC9D,MAAM,UAAU,UAAU,CACxB,KAA4E,EAC5E,IAAY;IAEZ,MAAM,GAAG,GAAG,WAAW,EAAE,CAAC;IAC1B,OAAO,WAAW,CAAC,GAAG,EAAE,aAAa,EAAE,EAAE,GAAG,KAAK,EAAE,EAAE,IAAI,CAAC,CAAC;AAC7D,CAAC;AAED,yCAAyC;AACzC,MAAM,UAAU,cAAc,CAAC,IAAY,EAAE,IAAY;IACvD,OAAO,WAAW,CAAC,CAAC,WAAW,EAAE,QAAQ,EAAE,IAAI,CAAC,EAAE,IAAI,CAAC,CAAC;AAC1D,CAAC;AAED,yEAAyE;AACzE,MAAM,UAAU,kBAAkB,CAAC,GAAW,EAAE,IAAY;IAC1D,OAAO,WAAW,CAAC,CAAC,UAAU,EAAE,QAAQ,EAAE,GAAG,EAAE,QAAQ,EAAE,GAAG,CAAC,EAAE,IAAI,CAAC,CAAC;AACvE,CAAC"}
|
|
@@ -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` 真跑）。
|
package/dist/xunji/index.js
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` 真跑）。
|
|
@@ -9,16 +9,16 @@
|
|
|
9
9
|
* - **按段逐个守**：每次 upsert 调用前都看“距上次 upsert 过去了多久”，窗口内先睡够再调
|
|
10
10
|
* （老行为“睡够再调”保留，见 `push.py:157-158`；`--dry-run` 仍不守不记，老 `:156` 同述）；
|
|
11
11
|
* - **跨天／跨进程也守**（把“跨天不守”当缺陷修掉）：上次调用时刻落在盘上状态文件里，
|
|
12
|
-
* 不同进程的两次 `push-plan`
|
|
13
|
-
* `~/.mavis/xunji_bridge_rate.json` 跨进程状态）；
|
|
12
|
+
* 不同进程的两次 `push-plan` 照样排开；
|
|
14
13
|
* - 时钟／睡眠／状态文件**全可注入**：生产走真实时间与 `<状态目录>/xunji_push_rate.json`
|
|
15
|
-
* （状态目录＝配置 `xunji.stateDir
|
|
14
|
+
* （状态目录＝配置 `xunji.stateDir`，空串＝默认落点 `<数据目录>/xunji`，见 `xunjiStateDir()`；#757 起不再 `~/.mavis`），
|
|
16
15
|
* 测试一律注入（不许睡真 45 秒，更不许碰真机状态文件）。
|
|
17
16
|
*/
|
|
18
17
|
/** 训记写接口限频窗口（秒）。老 `push.py:29` 同值；全模块只此一处，别处引用。 */
|
|
19
18
|
export declare const RATE_LIMIT_SECONDS = 45;
|
|
20
19
|
/** 状态文件目录的**唯一定义地**（读侧限频／写侧限频／同步状态三份状态文件都落这儿）：
|
|
21
|
-
* 配置里 `xunji.stateDir`
|
|
20
|
+
* 配置里 `xunji.stateDir` 非空即用它，空串＝默认落点 `<数据目录>/xunji`（#757 起不再 `~/.mavis`；
|
|
21
|
+
* 算式唯一定义地＝`src/paths.ts` 的 `stateDirOf`，本函数只做「读配置」的薄壳）。
|
|
22
22
|
* #676：这里原先各自硬写 `join(homedir(), '.mavis')`，三处同式；收成一处，配置也只读一处。 */
|
|
23
23
|
export declare function xunjiStateDir(): string;
|
|
24
24
|
/** 缺省状态文件：状态目录下与读侧分开的一份（读侧是 `xunji_bridge_rate.json`，`auth.py:40`）。 */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rateLimit.d.ts","sourceRoot":"","sources":["../../src/xunji/rateLimit.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"rateLimit.d.ts","sourceRoot":"","sources":["../../src/xunji/rateLimit.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAOH,mDAAmD;AACnD,eAAO,MAAM,kBAAkB,KAAK,CAAC;AAErC;;;mEAGmE;AACnE,wBAAgB,aAAa,IAAI,MAAM,CAGtC;AAED,uEAAuE;AACvE,wBAAgB,oBAAoB,IAAI,MAAM,CAE7C;AAED,4CAA4C;AAC5C,wBAAgB,eAAe,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,aAAa,GAAE,MAA2B,GAAG,MAAM,CAI5H;AAED,oDAAoD;AACpD,MAAM,WAAW,eAAe;IAC9B,4BAA4B;IAC5B,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,MAAM,CAAC;IAC5B,yBAAyB;IACzB,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAC/C,4DAA4D;IAC5D,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACpC;AAkCD,iDAAiD;AACjD,MAAM,WAAW,WAAW;IAC1B,qDAAqD;IACrD,KAAK,CAAC,MAAM,EAAE,OAAO,GAAG,OAAO,CAAC;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,UAAU,EAAE,OAAO,CAAA;KAAE,CAAC,CAAC;CAC5E;AAED,oDAAoD;AACpD,wBAAgB,iBAAiB,CAAC,IAAI,GAAE,eAAoB,EAAE,aAAa,GAAE,MAA2B,GAAG,WAAW,CAyBrH;AAED,uCAAuC;AACvC,wBAAgB,oBAAoB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAE/D"}
|
package/dist/xunji/rateLimit.js
CHANGED
|
@@ -9,24 +9,24 @@
|
|
|
9
9
|
* - **按段逐个守**：每次 upsert 调用前都看“距上次 upsert 过去了多久”，窗口内先睡够再调
|
|
10
10
|
* （老行为“睡够再调”保留，见 `push.py:157-158`；`--dry-run` 仍不守不记，老 `:156` 同述）；
|
|
11
11
|
* - **跨天／跨进程也守**（把“跨天不守”当缺陷修掉）：上次调用时刻落在盘上状态文件里，
|
|
12
|
-
* 不同进程的两次 `push-plan`
|
|
13
|
-
* `~/.mavis/xunji_bridge_rate.json` 跨进程状态）；
|
|
12
|
+
* 不同进程的两次 `push-plan` 照样排开；
|
|
14
13
|
* - 时钟／睡眠／状态文件**全可注入**：生产走真实时间与 `<状态目录>/xunji_push_rate.json`
|
|
15
|
-
* （状态目录＝配置 `xunji.stateDir
|
|
14
|
+
* （状态目录＝配置 `xunji.stateDir`，空串＝默认落点 `<数据目录>/xunji`，见 `xunjiStateDir()`；#757 起不再 `~/.mavis`），
|
|
16
15
|
* 测试一律注入（不许睡真 45 秒，更不许碰真机状态文件）。
|
|
17
16
|
*/
|
|
18
|
-
import { homedir } from 'node:os';
|
|
19
17
|
import { dirname, join } from 'node:path';
|
|
20
18
|
import { existsSync, mkdirSync, readFileSync, renameSync, writeFileSync } from 'node:fs';
|
|
21
19
|
import { loadCalorieConfig } from '../config.js';
|
|
20
|
+
import { resolveDbDir, stateDirOf } from '../paths.js';
|
|
22
21
|
/** 训记写接口限频窗口（秒）。老 `push.py:29` 同值；全模块只此一处，别处引用。 */
|
|
23
22
|
export const RATE_LIMIT_SECONDS = 45;
|
|
24
23
|
/** 状态文件目录的**唯一定义地**（读侧限频／写侧限频／同步状态三份状态文件都落这儿）：
|
|
25
|
-
* 配置里 `xunji.stateDir`
|
|
24
|
+
* 配置里 `xunji.stateDir` 非空即用它，空串＝默认落点 `<数据目录>/xunji`（#757 起不再 `~/.mavis`；
|
|
25
|
+
* 算式唯一定义地＝`src/paths.ts` 的 `stateDirOf`，本函数只做「读配置」的薄壳）。
|
|
26
26
|
* #676：这里原先各自硬写 `join(homedir(), '.mavis')`，三处同式；收成一处，配置也只读一处。 */
|
|
27
27
|
export function xunjiStateDir() {
|
|
28
28
|
const configured = loadCalorieConfig().values.xunji.stateDir;
|
|
29
|
-
return
|
|
29
|
+
return stateDirOf(resolveDbDir(), configured);
|
|
30
30
|
}
|
|
31
31
|
/** 缺省状态文件：状态目录下与读侧分开的一份（读侧是 `xunji_bridge_rate.json`，`auth.py:40`）。 */
|
|
32
32
|
export function defaultRateLimitPath() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rateLimit.js","sourceRoot":"","sources":["../../src/xunji/rateLimit.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"rateLimit.js","sourceRoot":"","sources":["../../src/xunji/rateLimit.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAEH,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAC1C,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,YAAY,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AACzF,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AACjD,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAEvD,mDAAmD;AACnD,MAAM,CAAC,MAAM,kBAAkB,GAAG,EAAE,CAAC;AAErC;;;mEAGmE;AACnE,MAAM,UAAU,aAAa;IAC3B,MAAM,UAAU,GAAG,iBAAiB,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC;IAC7D,OAAO,UAAU,CAAC,YAAY,EAAE,EAAE,UAAU,CAAC,CAAC;AAChD,CAAC;AAED,uEAAuE;AACvE,MAAM,UAAU,oBAAoB;IAClC,OAAO,IAAI,CAAC,aAAa,EAAE,EAAE,sBAAsB,CAAC,CAAC;AACvD,CAAC;AAED,4CAA4C;AAC5C,MAAM,UAAU,eAAe,CAAC,UAAyB,EAAE,KAAa,EAAE,gBAAwB,kBAAkB;IAClH,IAAI,UAAU,KAAK,IAAI;QAAE,OAAO,CAAC,CAAC;IAClC,MAAM,IAAI,GAAG,UAAU,GAAG,aAAa,GAAG,IAAI,GAAG,KAAK,CAAC;IACvD,OAAO,IAAI,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;AAC7B,CAAC;AAYD,kDAAkD;AAClD,SAAS,cAAc,CAAC,SAAiB;IACvC,IAAI,GAAW,CAAC;IAChB,IAAI,CAAC;QACH,GAAG,GAAG,YAAY,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;IACxC,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,CAAC;IACd,CAAC;IACD,IAAI,CAAC;QACH,MAAM,MAAM,GAAY,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACxC,MAAM,GAAG,GAAI,MAA+C,EAAE,eAAe,CAAC;QAC9E,IAAI,OAAO,GAAG,KAAK,QAAQ,IAAI,GAAG,KAAK,EAAE;YAAE,OAAO,IAAI,CAAC;QACvD,MAAM,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC3B,OAAO,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;IACzC,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC;AAED,sEAAsE;AACtE,SAAS,eAAe,CAAC,SAAiB,EAAE,KAAa;IACvD,IAAI,CAAC;QACH,SAAS,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QACnD,MAAM,GAAG,GAAG,SAAS,GAAG,MAAM,CAAC;QAC/B,aAAa,CAAC,GAAG,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,eAAe,EAAE,IAAI,IAAI,CAAC,KAAK,CAAC,CAAC,WAAW,EAAE,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC;QACxG,UAAU,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;QAC3B,OAAO,IAAI,CAAC;IACd,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC;AAQD,oDAAoD;AACpD,MAAM,UAAU,iBAAiB,CAAC,OAAwB,EAAE,EAAE,gBAAwB,kBAAkB;IACtG,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,IAAI,IAAI,CAAC,GAAG,CAAC;IACjC,MAAM,KAAK,GACT,IAAI,CAAC,KAAK;QACV,CAAC,CAAC,EAAU,EAAE,EAAE,CAAC,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,EAAE,GAAG,UAAU,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IACjF,MAAM,SAAS,GAAG,IAAI,CAAC,SAAS,KAAK,SAAS,CAAC,CAAC,CAAC,oBAAoB,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC;IACzF,IAAI,SAAS,GAAkB,IAAI,CAAC;IACpC,IAAI,OAAO,GAAG,KAAK,CAAC;IACpB,OAAO;QACL,KAAK,CAAC,KAAK,CAAC,MAAe;YACzB,IAAI,MAAM;gBAAE,OAAO,EAAE,QAAQ,EAAE,CAAC,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC;YACrD,MAAM,EAAE,GAAG,GAAG,EAAE,CAAC;YACjB,MAAM,IAAI,GAAG,SAAS,KAAK,IAAI,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,SAAS,CAAC,IAAI,SAAS,CAAC,CAAC;YAC1G,MAAM,IAAI,GAAG,eAAe,CAAC,IAAI,EAAE,EAAE,EAAE,aAAa,CAAC,CAAC;YACtD,IAAI,IAAI,GAAG,CAAC;gBAAE,MAAM,KAAK,CAAC,IAAI,CAAC,CAAC;YAChC,MAAM,OAAO,GAAG,GAAG,EAAE,CAAC;YACtB,IAAI,SAAS,KAAK,IAAI,EAAE,CAAC;gBACvB,SAAS,GAAG,OAAO,CAAC;gBACpB,OAAO,GAAG,IAAI,CAAC;gBACf,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC;YAC9C,CAAC;YACD,SAAS,GAAG,OAAO,CAAC;YACpB,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,UAAU,EAAE,eAAe,CAAC,SAAS,EAAE,OAAO,CAAC,EAAE,CAAC;QAC7E,CAAC;KACF,CAAC;AACJ,CAAC;AAED,uCAAuC;AACvC,MAAM,UAAU,oBAAoB,CAAC,SAAiB;IACpD,OAAO,UAAU,CAAC,SAAS,CAAC,CAAC;AAC/B,CAAC"}
|
package/dist/xunji/run-sync.d.ts
CHANGED
|
@@ -5,7 +5,7 @@
|
|
|
5
5
|
* 推送（串行 N 天 `push-plan`，45 秒限频）→ 回写（一次 `backfill --days N`）；
|
|
6
6
|
* - 天数缺省 3、起始偏移缺省 0（今天）、`dry-run` 只建状态文件不实际跑（老 `run_sync.py:168-175`）；
|
|
7
7
|
* - 状态文件与老同件名同写法（`<状态目录>/xunji_bridge_sync_state.json`，目录＝配置 `xunji.stateDir`，
|
|
8
|
-
*
|
|
8
|
+
* 空串＝默认落点 `<数据目录>/xunji`；原子写，供外部轮询；老 `run_sync.py:32／52-58`）；
|
|
9
9
|
* - 推送逐天记结果、回写记汇总（老 `:184-190／:221-225` 的摘要形状）。
|
|
10
10
|
*
|
|
11
11
|
* 修掉的老缺陷（不照抄）：老 `run_sync.py` 只在超时／抛错时判失败，子进程的 rc
|
package/dist/xunji/run-sync.js
CHANGED
|
@@ -5,7 +5,7 @@
|
|
|
5
5
|
* 推送（串行 N 天 `push-plan`，45 秒限频）→ 回写（一次 `backfill --days N`）；
|
|
6
6
|
* - 天数缺省 3、起始偏移缺省 0（今天）、`dry-run` 只建状态文件不实际跑（老 `run_sync.py:168-175`）；
|
|
7
7
|
* - 状态文件与老同件名同写法（`<状态目录>/xunji_bridge_sync_state.json`，目录＝配置 `xunji.stateDir`，
|
|
8
|
-
*
|
|
8
|
+
* 空串＝默认落点 `<数据目录>/xunji`；原子写，供外部轮询；老 `run_sync.py:32／52-58`）；
|
|
9
9
|
* - 推送逐天记结果、回写记汇总（老 `:184-190／:221-225` 的摘要形状）。
|
|
10
10
|
*
|
|
11
11
|
* 修掉的老缺陷（不照抄）：老 `run_sync.py` 只在超时／抛错时判失败，子进程的 rc
|
package/dist/xunji/run.d.ts
CHANGED
|
@@ -29,7 +29,7 @@ export interface XunjiCommandDeps {
|
|
|
29
29
|
readonly sleep?: (ms: number) => Promise<void>;
|
|
30
30
|
/** 现在（毫秒；限频门用；缺省 `Date.now`）。 */
|
|
31
31
|
readonly now?: () => number;
|
|
32
|
-
/** 限频状态文件（缺省
|
|
32
|
+
/** 限频状态文件（缺省 `<状态目录>/xunji_push_rate.json`；传 null 只记内存）。 */
|
|
33
33
|
readonly rateLimitPath?: string | null;
|
|
34
34
|
/** upsert 超时毫秒（缺省 30000）。 */
|
|
35
35
|
readonly timeoutMs?: number;
|
package/dist/xunji/run.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run.d.ts","sourceRoot":"","sources":["../../src/xunji/run.ts"],"names":[],"mappings":"AAWA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAMhD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAIrD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAEnD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAG/C,OAAO,EAAyB,KAAK,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAC5E,OAAO,EAAqB,KAAK,WAAW,EAAE,MAAM,eAAe,CAAC;AAIpE,gDAAgD;AAChD,MAAM,WAAW,QAAQ;IACvB,QAAQ,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IACnC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,gEAAgE;IAChE,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC;IACvB,kCAAkC;IAClC,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;CAChC;AAED;kEACkE;AAClE,MAAM,WAAW,gBAAgB;IAC/B,+CAA+C;IAC/C,QAAQ,CAAC,UAAU,CAAC,EAAE,aAAa,CAAC;IACpC,6BAA6B;IAC7B,QAAQ,CAAC,SAAS,CAAC,EAAE,eAAe,CAAC;IACrC,+BAA+B;IAC/B,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,mCAAmC;IACnC,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,MAAM,GAAG,IAAI,CAAC;IACvC,kCAAkC;IAClC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAC/C,iCAAiC;IACjC,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,MAAM,CAAC;IAC5B,
|
|
1
|
+
{"version":3,"file":"run.d.ts","sourceRoot":"","sources":["../../src/xunji/run.ts"],"names":[],"mappings":"AAWA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAMhD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAIrD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAEnD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAG/C,OAAO,EAAyB,KAAK,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAC5E,OAAO,EAAqB,KAAK,WAAW,EAAE,MAAM,eAAe,CAAC;AAIpE,gDAAgD;AAChD,MAAM,WAAW,QAAQ;IACvB,QAAQ,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IACnC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,gEAAgE;IAChE,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC;IACvB,kCAAkC;IAClC,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;CAChC;AAED;kEACkE;AAClE,MAAM,WAAW,gBAAgB;IAC/B,+CAA+C;IAC/C,QAAQ,CAAC,UAAU,CAAC,EAAE,aAAa,CAAC;IACpC,6BAA6B;IAC7B,QAAQ,CAAC,SAAS,CAAC,EAAE,eAAe,CAAC;IACrC,+BAA+B;IAC/B,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,mCAAmC;IACnC,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,MAAM,GAAG,IAAI,CAAC;IACvC,kCAAkC;IAClC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAC/C,iCAAiC;IACjC,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,MAAM,CAAC;IAC5B,4DAA4D;IAC5D,QAAQ,CAAC,aAAa,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACvC,6BAA6B;IAC7B,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;IAC5B,yBAAyB;IACzB,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,CAAC;IAC7B,+DAA+D;IAC/D,QAAQ,CAAC,gBAAgB,CAAC,EAAE,OAAO,CAAC;IACpC,4DAA4D;IAC5D,QAAQ,CAAC,kBAAkB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5C,yDAAyD;IACzD,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IACzB,0CAA0C;IAC1C,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,YAAY,CAAC;IACnD,oCAAoC;IACpC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,OAAO,CAAC,YAAY,CAAC,CAAC;IAC/D,yDAAyD;IACzD,QAAQ,CAAC,OAAO,CAAC,EAAE,WAAW,CAAC;IAC/B,QAAQ,CAAC,IAAI,CAAC,EAAE,WAAW,CAAC;CAC7B;AA6OD,uDAAuD;AACvD,wBAAsB,eAAe,CAAC,IAAI,EAAE,SAAS,MAAM,EAAE,EAAE,IAAI,GAAE,gBAAqB,GAAG,OAAO,CAAC,QAAQ,CAAC,CA6B7G"}
|