@lark-base-open/base-database-cli 1.7.0 → 1.8.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/CHANGELOG.md +24 -0
- package/README.md +1 -1
- package/dist/agent-tools-guide.d.ts.map +1 -1
- package/dist/agent-tools-guide.js +5 -4
- package/dist/agent-tools-guide.js.map +1 -1
- package/dist/archive.d.ts.map +1 -1
- package/dist/archive.js +15 -1
- package/dist/archive.js.map +1 -1
- package/dist/auth.d.ts +6 -1
- package/dist/auth.d.ts.map +1 -1
- package/dist/auth.js +32 -11
- package/dist/auth.js.map +1 -1
- package/dist/build-info.d.ts +3 -0
- package/dist/build-info.d.ts.map +1 -0
- package/dist/build-info.js +63 -0
- package/dist/build-info.js.map +1 -0
- package/dist/dev-url.d.ts.map +1 -1
- package/dist/dev-url.js +6 -4
- package/dist/dev-url.js.map +1 -1
- package/dist/lark-cli.d.ts +3 -0
- package/dist/lark-cli.d.ts.map +1 -1
- package/dist/lark-cli.js +23 -7
- package/dist/lark-cli.js.map +1 -1
- package/dist/program.d.ts.map +1 -1
- package/dist/program.js +7 -3
- package/dist/program.js.map +1 -1
- package/dist/source-format.d.ts +1 -0
- package/dist/source-format.d.ts.map +1 -1
- package/dist/source-format.js +5 -2
- package/dist/source-format.js.map +1 -1
- package/package.json +1 -1
- package/skills/lark-base-database/references/agent-tools.md +10 -2
- package/skills/lark-base-database/references/base-sql-errors.generated.md +2 -0
- package/skills/lark-base-database/references/development.md +2 -0
- package/skills/lark-base-database/references/frontend-design-guide.md +1 -1
- package/skills/lark-base-database/references/workspace.md +4 -2
- package/templates/database-starter-v2/base-app.config.ts +2 -0
- package/templates/database-starter-v2/package-lock.json +9 -9
- package/templates/database-starter-v2/page/package.json +1 -1
- package/templates/database-starter-v2/page/src/App.tsx +1 -1
- package/templates/database-starter-v2/page/src/index.css +29 -1
- package/templates/database-starter-v2/server/package.json +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,29 @@
|
|
|
1
1
|
# Changelog
|
|
2
2
|
|
|
3
|
+
## [1.8.1] - 2026-10-29
|
|
4
|
+
|
|
5
|
+
### Fixed
|
|
6
|
+
|
|
7
|
+
- 修复新建工程的默认浅色主题与业务配色，避免页面明暗不一致。
|
|
8
|
+
- 完善主题切换指引，按工程实际安装的 SDK 判断可用能力。
|
|
9
|
+
|
|
10
|
+
## [1.8.0] - 2026-10-29
|
|
11
|
+
|
|
12
|
+
### Added
|
|
13
|
+
|
|
14
|
+
- 上传的页面入口保留 CLI 版本信息，便于定位部署来源。
|
|
15
|
+
|
|
16
|
+
### Changed
|
|
17
|
+
|
|
18
|
+
- 新建工程的 Page 和 Server SDK 统一升级到 `0.5.1`，补充运行版本上报和错误监控；存量工程保留原 SDK，升级需用户显式授权。
|
|
19
|
+
|
|
20
|
+
### Fixed
|
|
21
|
+
|
|
22
|
+
- 站点 Skill 的安装和调用指引保留所选 user 或 bot 身份，避免使用 bot 时被引导到用户身份。
|
|
23
|
+
- `doctor` 按所选 user 或 bot 身份检查授权及应用访问能力，避免用用户登录态误判 bot 状态。
|
|
24
|
+
- 修复从 Studio 入口启动 `dev` 时生成的本地联调地址。
|
|
25
|
+
- 补充数组判断与 `GENERATE_SERIES` 的查询错误指引。
|
|
26
|
+
|
|
3
27
|
## [1.7.0] - 2026-10-26
|
|
4
28
|
|
|
5
29
|
### Added
|
package/README.md
CHANGED
|
@@ -353,7 +353,7 @@ workspace 迁移中的 helper 检查只处理已核验 hash 的原模板；定
|
|
|
353
353
|
|
|
354
354
|
### 本地开发（Preview）
|
|
355
355
|
|
|
356
|
-
`base-database-cli dev` 启动本地 Vite 并输出宿主开发地址。地址形态为 `/baseapp/dev/<siteToken>/<port>#t
|
|
356
|
+
`base-database-cli dev` 启动本地 Vite 并输出宿主开发地址。地址形态为 `/baseapp/dev/<siteToken>/<port>#t=<配对令牌>`（Catalog 的 baseAppUrl 为 studio 入口时为 `/baseapp/studio/dev/<siteToken>/<port>`），基于 Catalog 的 baseAppUrl；可显式 `--host-origin https://<实际宿主域名>` 切换宿主 origin。
|
|
357
357
|
用 CLI 输出的完整链接打开；复制地址栏链接给别人会自动打开线上版本。若弹出或地址栏出现访问本地网络/本机设备请求，请允许后点重试。配对通过后显示常驻“本地调试中”提示条，请核对 Base/表与写入范围。CLI 不创建、续租或关闭服务端开发会话。
|
|
358
358
|
`home`、`new`、`static`、`dev` 为宿主保留段，不能作为应用 token；旧 `/baseapp/<siteToken>/dev/<port>` 不再兼容。
|
|
359
359
|
服务仅监听 `127.0.0.1:43100–43109`，显式 `--port` 被占用时失败；默认在白名单中选择。
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"agent-tools-guide.d.ts","sourceRoot":"","sources":["../src/agent-tools-guide.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAsCvD,wBAAgB,2BAA2B,CACzC,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,MAAM,EACf,MAAM,EAAE;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;CAAE,EACvD,WAAW,EAAE,MAAM,EAAE,GACpB,IAAI,CA2BN;AAED,MAAM,WAAW,kBAAkB;IACjC,WAAW,EAAE,SAAS,GAAG,MAAM,CAAC;IAChC,YAAY,EAAE;QAAE,SAAS,EAAE,OAAO,CAAC;QAAC,OAAO,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC;IACvE,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,kBAAkB,CAAC,EAAE;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC;IAC3E,OAAO,CAAC,EAAE;QAAE,QAAQ,EAAE,MAAM,CAAA;KAAE,CAAC;CAChC;AAED,uFAAuF;AACvF,wBAAgB,kBAAkB,CAChC,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,cAAc,EACvB,WAAW,EAAE,SAAS,GAAG,MAAM,EAC/B,GAAG,EAAE,MAAM,CAAC,UAAU,EACtB,UAAU,CAAC,EAAE,MAAM,GAClB,kBAAkB,
|
|
1
|
+
{"version":3,"file":"agent-tools-guide.d.ts","sourceRoot":"","sources":["../src/agent-tools-guide.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAsCvD,wBAAgB,2BAA2B,CACzC,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,MAAM,EACf,MAAM,EAAE;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;CAAE,EACvD,WAAW,EAAE,MAAM,EAAE,GACpB,IAAI,CA2BN;AAED,MAAM,WAAW,kBAAkB;IACjC,WAAW,EAAE,SAAS,GAAG,MAAM,CAAC;IAChC,YAAY,EAAE;QAAE,SAAS,EAAE,OAAO,CAAC;QAAC,OAAO,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC;IACvE,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,kBAAkB,CAAC,EAAE;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC;IAC3E,OAAO,CAAC,EAAE;QAAE,QAAQ,EAAE,MAAM,CAAA;KAAE,CAAC;CAChC;AAED,uFAAuF;AACvF,wBAAgB,kBAAkB,CAChC,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,cAAc,EACvB,WAAW,EAAE,SAAS,GAAG,MAAM,EAC/B,GAAG,EAAE,MAAM,CAAC,UAAU,EACtB,UAAU,CAAC,EAAE,MAAM,GAClB,kBAAkB,CAiHpB;AAsBD,wBAAgB,oBAAoB,CAClC,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,cAAc,EACvB,WAAW,EAAE,SAAS,GAAG,MAAM,EAC/B,GAAG,EAAE,MAAM,CAAC,UAAU,EACtB,UAAU,CAAC,EAAE,MAAM;;;EA4BpB"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { createHash } from 'node:crypto';
|
|
2
2
|
import { mkdirSync, readFileSync, writeFileSync } from 'node:fs';
|
|
3
3
|
import { dirname, join } from 'node:path';
|
|
4
|
-
import { responseData, runLarkCli } from './lark-cli.js';
|
|
4
|
+
import { resolveLarkIdentity, responseData, runLarkCli } from './lark-cli.js';
|
|
5
5
|
import { LarkCliError, safeDiagnostic } from './lark-cli-error.js';
|
|
6
6
|
const receiptPath = (workspace) => join(workspace, '.base-database-cli/state/agent-tools-skill.json');
|
|
7
7
|
const digest = (content) => createHash('sha256').update(content).digest('hex');
|
|
@@ -37,7 +37,8 @@ export function recordSiteSkillInstallation(workspace, appToken, runtime, bundle
|
|
|
37
37
|
/** Prod Skill availability is optional and must never fail a completed publication. */
|
|
38
38
|
export function externalAgentGuide(workspace, appToken, runtime, environment, env, baseAppUrl) {
|
|
39
39
|
const cli = runtime.deployCommand.replace(/ deploy$/, '');
|
|
40
|
-
const
|
|
40
|
+
const identity = resolveLarkIdentity(env, workspace);
|
|
41
|
+
const command = `${cli} agent-tools skill install --as ${identity}`;
|
|
41
42
|
const projectUpdate = '工程安装（不带 --site）如目标目录已存在，请先核对目标，在用户授权下加 --force 重新安装。';
|
|
42
43
|
if (environment === 'preview') {
|
|
43
44
|
return {
|
|
@@ -54,8 +55,8 @@ export function externalAgentGuide(workspace, appToken, runtime, environment, en
|
|
|
54
55
|
};
|
|
55
56
|
}
|
|
56
57
|
const path = `/open-apis/base/v3/sites/${encodeURIComponent(appToken)}/skill`;
|
|
57
|
-
const skillCommand = `${cli} lark-cli -- api GET ${path} --as
|
|
58
|
-
const functionsCommand = `${cli} lark-cli -- api GET /open-apis/base/v3/sites/${encodeURIComponent(appToken)}/functions --params '{"apiVersion":2,"env":"prod"}' --as
|
|
58
|
+
const skillCommand = `${cli} lark-cli -- api GET ${path} --as ${identity}`;
|
|
59
|
+
const functionsCommand = `${cli} lark-cli -- api GET /open-apis/base/v3/sites/${encodeURIComponent(appToken)}/functions --params '{"apiVersion":2,"env":"prod"}' --as ${identity}`;
|
|
59
60
|
try {
|
|
60
61
|
// Only confirm availability: do not parse SKILL.md or compare hashes.
|
|
61
62
|
runLarkCli(['api', 'GET', path], env, workspace);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"agent-tools-guide.js","sourceRoot":"","sources":["../src/agent-tools-guide.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AACjE,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAE1C,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"agent-tools-guide.js","sourceRoot":"","sources":["../src/agent-tools-guide.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AACjE,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAE1C,OAAO,EAAE,mBAAmB,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC9E,OAAO,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAEnE,MAAM,WAAW,GAAG,CAAC,SAAiB,EAAE,EAAE,CACxC,IAAI,CAAC,SAAS,EAAE,iDAAiD,CAAC,CAAC;AACrE,MAAM,MAAM,GAAG,CAAC,OAAe,EAAE,EAAE,CACjC,UAAU,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;AAWrD,SAAS,WAAW,CAClB,SAAiB,EACjB,QAAgB,EAChB,OAAe;IAEf,IAAI,CAAC;QACH,MAAM,OAAO,GAAY,IAAI,CAAC,KAAK,CACjC,YAAY,CAAC,WAAW,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC,CAC7C,CAAC;QACF,OAAO,OAAO,CAAC,QAAQ,KAAK,QAAQ;YAClC,OAAO,CAAC,OAAO,KAAK,OAAO;YAC3B,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,aAAa,CAAC;YACpC,CAAC,CAAC,OAAO,CAAC,aAAa;YACvB,CAAC,CAAC,EAAE,CAAC;IACT,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,EAAE,CAAC;IACZ,CAAC;AACH,CAAC;AAED,kGAAkG;AAClG,MAAM,UAAU,2BAA2B,CACzC,SAAiB,EACjB,QAAgB,EAChB,OAAe,EACf,MAAuD,EACvD,WAAqB;IAErB,MAAM,aAAa,GAAG,WAAW,CAAC,SAAS,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC,MAAM,CACpE,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,WAAW,CAAC,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,CAChD,CAAC;IACF,MAAM,KAAK,GAAG,MAAM,CAAC,WAAW,CAC9B,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,OAAO,CAAC,EAAE,EAAE,CAAC;QACpD,IAAI;QACJ,MAAM,CAAC,OAAO,CAAC;KAChB,CAAC,CACH,CAAC;IACF,aAAa,CAAC,IAAI,CAChB,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC;QACjC,SAAS;QACT,IAAI,EAAE,MAAM,CAAC,IAAI;QACjB,KAAK;KACN,CAAC,CAAC,CACJ,CAAC;IACF,MAAM,IAAI,GAAG,WAAW,CAAC,SAAS,CAAC,CAAC;IACpC,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IAC9C,aAAa,CACX,IAAI,EACJ,IAAI,CAAC,SAAS,CACZ,EAAE,QAAQ,EAAE,OAAO,EAAE,aAAa,EAAoB,EACtD,IAAI,EACJ,CAAC,CACF,GAAG,IAAI,CACT,CAAC;AACJ,CAAC;AAWD,uFAAuF;AACvF,MAAM,UAAU,kBAAkB,CAChC,SAAiB,EACjB,QAAgB,EAChB,OAAuB,EACvB,WAA+B,EAC/B,GAAsB,EACtB,UAAmB;IAEnB,MAAM,GAAG,GAAG,OAAO,CAAC,aAAa,CAAC,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;IAC1D,MAAM,QAAQ,GAAG,mBAAmB,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;IACrD,MAAM,OAAO,GAAG,GAAG,GAAG,mCAAmC,QAAQ,EAAE,CAAC;IACpE,MAAM,aAAa,GACjB,sDAAsD,CAAC;IACzD,IAAI,WAAW,KAAK,SAAS,EAAE,CAAC;QAC9B,OAAO;YACL,WAAW;YACX,YAAY,EAAE;gBACZ,SAAS,EAAE,KAAK;gBAChB,OAAO,EACL,qFAAqF;oBACrF,aAAa;gBACf,OAAO;aACR;YACD,OAAO,EAAE;gBACP,QAAQ,EAAE,kDAAkD,OAAO,SAAS,aAAa,EAAE;aAC5F;SACF,CAAC;IACJ,CAAC;IACD,MAAM,IAAI,GAAG,4BAA4B,kBAAkB,CAAC,QAAQ,CAAC,QAAQ,CAAC;IAC9E,MAAM,YAAY,GAAG,GAAG,GAAG,wBAAwB,IAAI,SAAS,QAAQ,EAAE,CAAC;IAC3E,MAAM,gBAAgB,GAAG,GAAG,GAAG,iDAAiD,kBAAkB,CAAC,QAAQ,CAAC,4DAA4D,QAAQ,EAAE,CAAC;IACnL,IAAI,CAAC;QACH,sEAAsE;QACtE,UAAU,CAAC,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,CAAC,EAAE,GAAG,EAAE,SAAS,CAAC,CAAC;IACnD,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,KAAK,GACT,KAAK,YAAY,YAAY,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC;QAClE,MAAM,UAAU,GAAG,KAAK;YACtB,CAAC,CAAC,YAAY,cAAc,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,sBAAsB,EAAE,GAAG,CAAC,GAAG;YAChF,CAAC,CAAC,EAAE,CAAC;QACP,OAAO,CAAC,MAAM,CAAC,KAAK,CAClB,gFAAgF,UAAU,KAAK,CAChG,CAAC;QACF,OAAO;YACL,WAAW;YACX,YAAY,EAAE;gBACZ,SAAS,EAAE,KAAK;gBAChB,OAAO,EACL,8CAA8C;oBAC9C,aAAa;gBACf,OAAO;aACR;YACD,YAAY;YACZ,gBAAgB;SACjB,CAAC;IACJ,CAAC;IACD,MAAM,kBAAkB,GAAG,UAAU;QACnC,CAAC,CAAC;YACE,OAAO,EAAE,UAAU;YACnB,OAAO,EAAE,GAAG,OAAO,WAAW,UAAU,CAAC,UAAU,CAAC,EAAE;YACtD,OAAO,EACL,gDAAgD;SACnD;QACH,CAAC,CAAC,SAAS,CAAC;IACd,IAAI,iBAAqC,CAAC;IAC1C,IAAI,UAAU,EAAE,CAAC;QACf,IAAI,CAAC;YACH,MAAM,OAAO,GAAG,YAAY,CAC1B,UAAU,CACR;gBACE,KAAK;gBACL,KAAK;gBACL,4BAA4B,kBAAkB,CAAC,QAAQ,CAAC,MAAM;gBAC9D,UAAU;gBACV,IAAI,CAAC,SAAS,CAAC,EAAE,GAAG,EAAE,WAAW,EAAE,CAAC;aACrC,EACD,GAAG,EACH,SAAS,CACV,CACF,CAAC,OAAO,CAAC;YACV,IACE,OAAO;gBACP,OAAO,OAAO,KAAK,QAAQ;gBAC3B,MAAM,IAAI,OAAO;gBACjB,OAAO,OAAO,CAAC,IAAI,KAAK,QAAQ;gBAChC,OAAO,CAAC,IAAI,CAAC,IAAI,EAAE;gBAEnB,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;QAC5C,CAAC;QAAC,MAAM,CAAC;YACP,kEAAkE;QACpE,CAAC;IACH,CAAC;IACD,MAAM,OAAO,GAAG;QACd,yCAAyC,OAAO,4CAA4C,aAAa,EAAE;QAC3G,GAAG,CAAC,kBAAkB;YACpB,CAAC,CAAC;gBACE,EAAE;gBACF,WAAW;gBACX,iBAAiB;oBACf,CAAC,CAAC,QAAQ,YAAY,CAAC,iBAAiB,CAAC,IAAI,WAAW,CAAC,UAAW,CAAC,GAAG;oBACxE,CAAC,CAAC,UAAU,WAAW,CAAC,UAAW,CAAC,EAAE;gBACxC,YAAY,kBAAkB,CAAC,OAAO,IAAI;gBAC1C,yDAAyD;aAC1D;YACH,CAAC,CAAC,EAAE,CAAC;KACR,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACb,OAAO;QACL,WAAW;QACX,YAAY,EAAE;YACZ,SAAS,EAAE,IAAI;YACf,OAAO,EACL,kDAAkD;gBAClD,aAAa;YACf,OAAO;SACR;QACD,YAAY;QACZ,gBAAgB;QAChB,GAAG,CAAC,kBAAkB,CAAC,CAAC,CAAC,EAAE,kBAAkB,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACrD,OAAO,EAAE,EAAE,QAAQ,EAAE,OAAO,EAAE;KAC/B,CAAC;AACJ,CAAC;AAED,SAAS,YAAY,CAAC,KAAa;IACjC,OAAO,KAAK;SACT,OAAO,CAAC,wBAAwB,EAAE,GAAG,CAAC;SACtC,OAAO,CAAC,kBAAkB,EAAE,EAAE,CAAC;SAC/B,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC;SACnB,IAAI,EAAE;SACN,OAAO,CAAC,6BAA6B,EAAE,MAAM,CAAC,CAAC;AACpD,CAAC;AAED,SAAS,WAAW,CAAC,KAAa;IAChC,OAAO,KAAK;SACT,UAAU,CAAC,IAAI,EAAE,MAAM,CAAC;SACxB,UAAU,CAAC,GAAG,EAAE,KAAK,CAAC;SACtB,UAAU,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;AAC5B,CAAC;AAED,SAAS,UAAU,CAAC,KAAa;IAC/B,OAAO,IAAI,KAAK,CAAC,UAAU,CAAC,GAAG,EAAE,OAAO,CAAC,GAAG,CAAC;AAC/C,CAAC;AAED,MAAM,UAAU,oBAAoB,CAClC,SAAiB,EACjB,QAAgB,EAChB,OAAuB,EACvB,WAA+B,EAC/B,GAAsB,EACtB,UAAmB;IAEnB,MAAM,aAAa,GAAG,kBAAkB,CACtC,SAAS,EACT,QAAQ,EACR,OAAO,EACP,WAAW,EACX,GAAG,EACH,UAAU,CACX,CAAC;IACF,MAAM,QAAQ,GACZ,WAAW,KAAK,SAAS;QACvB,CAAC,CAAC,2PAA2P;QAC7P,CAAC,CAAC,mGAAmG,CAAC;IAC1G,MAAM,YAAY,GAChB,WAAW,KAAK,MAAM;QACpB,CAAC,CAAC,wCAAwC,aAAa,CAAC,gBAAgB,sVAAsV,aAAa,CAAC,YAAY,6SAA6S;QACruB,CAAC,CAAC,EAAE,CAAC;IACT,OAAO;QACL,QAAQ,EACN,QAAQ;YACR,YAAY;YACZ,CAAC,aAAa,CAAC,OAAO;gBACpB,CAAC,CAAC,8MAA8M;gBAChN,CAAC,CAAC,kFAAkF,CAAC;YACvF,6FAA6F;QAC/F,aAAa;KACd,CAAC;AACJ,CAAC"}
|
package/dist/archive.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"archive.d.ts","sourceRoot":"","sources":["../src/archive.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"archive.d.ts","sourceRoot":"","sources":["../src/archive.ts"],"names":[],"mappings":"AA0CA,OAAO,EAKL,KAAK,YAAY,EAClB,MAAM,sBAAsB,CAAC;AAY9B,MAAM,WAAW,qBAAqB;IACpC,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IACxB,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,6BAA6B;IAC5C,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,qBAAqB,CAAC,cAAc,CAAC,CAAC;IACpD,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACrC,wGAAwG;IACxG,gBAAgB,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,EAAE,CAAC,CAAC;IAC5C,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,CAAC;CACxC;AAED,MAAM,WAAW,qBAAqB;IACpC,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,EAAE,MAAM,CAAC;CACd;AAED,MAAM,WAAW,yBAAyB;IACxC,QAAQ,EAAE,MAAM,CAAC;IACjB,aAAa,EAAE,qBAAqB,EAAE,CAAC;CACxC;AA4JD,MAAM,WAAW,0BAA0B;IACzC,4CAA4C;IAC5C,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;CAChB;AAgFD,sHAAsH;AACtH,wBAAgB,+BAA+B,CAC7C,SAAS,EAAE,MAAM,GAChB,0BAA0B,EAAE,CAG9B;AAED,qBAAa,wBAAyB,SAAQ,KAAK;IACjD,QAAQ,CAAC,IAAI,mCAAmC;IAChD,QAAQ,CAAC,SAAS,EAAE,KAAK,CAAC;QACxB,UAAU,EAAE,MAAM,CAAC;QACnB,IAAI,EAAE,MAAM,CAAC;QACb,QAAQ,EAAE,MAAM,EAAE,CAAC;QACnB,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;QACjC,SAAS,EAAE,OAAO,CAAC;KACpB,CAAC,CAAC;IACH,YAAY,QAAQ,EAAE,0BAA0B,EAAE,EAqEjD;CACF;AAED,wBAAgB,0BAA0B,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI,CAGlE;AAED,sFAAsF;AACtF,wBAAgB,4BAA4B,CAC1C,SAAS,EAAE,MAAM,GAChB,YAAY,EAAE,CAGhB;AA+BD;;;;;GAKG;AACH,wBAAgB,kCAAkC,CAChD,SAAS,EAAE,MAAM,EACjB,EAAE,mBAA0B,EAAE,GAAE;IAAE,mBAAmB,CAAC,EAAE,OAAO,CAAA;CAAO,GACrE,6BAA6B,EAAE,CAgBjC;AAoBD,gGAAgG;AAChG,wBAAgB,gBAAgB,CAC9B,IAAI,EAAE,IAAI,CAAC,qBAAqB,EAAE,YAAY,GAAG,cAAc,CAAC,GAC/D,MAAM,CAAC,MAAM,EAAE,OAAO,EAAE,CAAC,CA2B3B;AAED,kFAAkF;AAClF,wBAAgB,wBAAwB,CAAC,SAAS,EAAE,MAAM;IAGtD,GAAG;IACH,IAAI;IACJ,QAAQ;EAEX;AAED,8EAA8E;AAC9E,wBAAgB,yBAAyB,CACvC,SAAS,EAAE,MAAM,GAChB,qBAAqB,EAAE,CAUzB;AAkID,wBAAgB,uBAAuB,CACrC,SAAS,EAAE,MAAM,GAChB,yBAAyB,CAK3B;AAED,wBAAsB,eAAe,CACnC,SAAS,EAAE,MAAM,EACjB,QAAQ,GAAE,yBAA8D;;;;;GAwCzE"}
|
package/dist/archive.js
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { readBuildInfoHtml } from './build-info.js';
|
|
1
2
|
import { MAX_SOURCE_ARCHIVE_BYTES, compressedSourceArchiveSizeError, sourceArchiveComment, } from './source-format.js';
|
|
2
3
|
import { SOURCE_ARCHIVE_IGNORES, SOURCE_ARCHIVE_SKIPS, sourceArchiveConfig, sourceArchiveRootFiles, sourceArchiveRoots, } from './source-archive-inputs.js';
|
|
3
4
|
import { isContractProject } from './build-server.js';
|
|
@@ -416,6 +417,8 @@ function createArchive(workspace, destination) {
|
|
|
416
417
|
(!aiRootMetadata.isDirectory() || aiRootMetadata.isSymbolicLink())) {
|
|
417
418
|
return Promise.reject(new Error('Project ai/ must be a directory'));
|
|
418
419
|
}
|
|
420
|
+
// Cloud builds consume source, not local dist. Stamp only the archive copy.
|
|
421
|
+
const pageHtml = readBuildInfoHtml(join(workspace, 'page/index.html'));
|
|
419
422
|
return new Promise((resolvePromise, reject) => {
|
|
420
423
|
const output = createWriteStream(destination);
|
|
421
424
|
const zip = new ZipArchive({
|
|
@@ -439,8 +442,19 @@ function createArchive(workspace, destination) {
|
|
|
439
442
|
for (const { source, prefix } of sourceArchiveRoots(workspace)) {
|
|
440
443
|
const directory = join(workspace, source);
|
|
441
444
|
if (existsSync(directory))
|
|
442
|
-
zip.glob('**/*', {
|
|
445
|
+
zip.glob('**/*', {
|
|
446
|
+
...globOptions,
|
|
447
|
+
cwd: directory,
|
|
448
|
+
ignore: [
|
|
449
|
+
...globOptions.ignore,
|
|
450
|
+
...(source === 'page' && pageHtml !== undefined
|
|
451
|
+
? ['index.html']
|
|
452
|
+
: []),
|
|
453
|
+
],
|
|
454
|
+
}, { prefix });
|
|
443
455
|
}
|
|
456
|
+
if (pageHtml !== undefined)
|
|
457
|
+
zip.append(pageHtml, { name: 'page/index.html' });
|
|
444
458
|
for (const file of sourceArchiveRootFiles(workspace)) {
|
|
445
459
|
if (existsSync(join(workspace, file)))
|
|
446
460
|
zip.file(join(workspace, file), { name: file });
|
package/dist/archive.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"archive.js","sourceRoot":"","sources":["../src/archive.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"archive.js","sourceRoot":"","sources":["../src/archive.ts"],"names":[],"mappings":"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"}
|
package/dist/auth.d.ts
CHANGED
|
@@ -10,6 +10,7 @@ export declare function whoami(profile?: RuntimeProfile, larkProfile?: string):
|
|
|
10
10
|
export declare function doctor(profile?: RuntimeProfile, selectedLarkProfile?: string): Promise<{
|
|
11
11
|
ok: true;
|
|
12
12
|
environment: string;
|
|
13
|
+
identity: "bot" | "user";
|
|
13
14
|
larkProfile?: string | undefined;
|
|
14
15
|
node: string;
|
|
15
16
|
sdkCompatibility: ((SDKCompatibilityWarning & {
|
|
@@ -21,9 +22,13 @@ export declare function doctor(profile?: RuntimeProfile, selectedLarkProfile?: s
|
|
|
21
22
|
} & {
|
|
22
23
|
severity: 'error';
|
|
23
24
|
}))[];
|
|
25
|
+
serviceAccess: {
|
|
26
|
+
status: string;
|
|
27
|
+
source: string;
|
|
28
|
+
};
|
|
24
29
|
userScopes: {
|
|
25
30
|
status: string;
|
|
26
|
-
required: readonly ["base:appmode:read", "base:appmode:create", "base:appmode:update"];
|
|
31
|
+
required: never[] | readonly ["base:appmode:read", "base:appmode:create", "base:appmode:update"];
|
|
27
32
|
};
|
|
28
33
|
user: {
|
|
29
34
|
status: unknown;
|
package/dist/auth.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.d.ts","sourceRoot":"","sources":["../src/auth.ts"],"names":[],"mappings":"AACA,OAAO,EAGL,KAAK,uBAAuB,EAC7B,MAAM,wBAAwB,CAAC;AAGhC,OAAO,EAGL,KAAK,cAAc,EACpB,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"auth.d.ts","sourceRoot":"","sources":["../src/auth.ts"],"names":[],"mappings":"AACA,OAAO,EAGL,KAAK,uBAAuB,EAC7B,MAAM,wBAAwB,CAAC;AAGhC,OAAO,EAGL,KAAK,cAAc,EACpB,MAAM,kBAAkB,CAAC;AAW1B,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE1C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AA8ChD,eAAO,MAAM,cAAc,YACzB,mBAAmB,EACnB,qBAAqB,EACrB,qBAAqB,CACb,CAAC;AAOX,wBAAgB,mBAAmB,CACjC,GAAG,EAAE,MAAM,CAAC,UAAU,EACtB,MAAM,oBAAa,GAClB,IAAI,CAkBN;AAED,wBAAsB,KAAK,CACzB,OAAO,GAAE,cAAuC,EAChD,WAAW,CAAC,EAAE,MAAM,EACpB,IAAI,UAAQ,GACX,OAAO,CAAC,IAAI,CAAC,CAsBf;AAED,wBAAsB,MAAM,CAC1B,OAAO,GAAE,cAAuC,EAChD,WAAW,CAAC,EAAE,MAAM,EACpB,IAAI,UAAQ,GACX,OAAO,CAAC,IAAI,CAAC,CAYf;AAED,wBAAsB,MAAM,CAC1B,OAAO,GAAE,cAAuC,EAChD,WAAW,CAAC,EAAE,MAAM,0BASrB;AAED,wBAAsB,MAAM,CAC1B,OAAO,GAAE,cAAuC,EAChD,mBAAmB,CAAC,EAAE,MAAM;;;;;;;kBAKe,SAAS;;;;;;kBACW,OAAO;;;QA0ElE,MAAM;QACN,MAAM;;;;;;;;;;;;GAoBX"}
|
package/dist/auth.js
CHANGED
|
@@ -2,7 +2,7 @@ import { existsSync } from 'node:fs';
|
|
|
2
2
|
import { checkSDKCompatibility, SDKCompatibilityError, } from './sdk-compatibility.js';
|
|
3
3
|
import { CONFIG_FILE_NAME, readConfig } from './config.js';
|
|
4
4
|
import { assertProjectRuntimeProfile, ONLINE_RUNTIME_PROFILE, } from './environment.js';
|
|
5
|
-
import { resolveLarkCliExecutable, runLarkCli, selectLarkProfileEnvironment, resolveLarkProfileEnvironment, isMissingLarkCommand, responseData, } from './lark-cli.js';
|
|
5
|
+
import { resolveLarkCliExecutable, larkCliEnvironment, runLarkCli, selectLarkProfileEnvironment, resolveLarkProfileEnvironment, isMissingLarkCommand, responseData, resolveLarkIdentity, } from './lark-cli.js';
|
|
6
6
|
import { runCommand } from './process.js';
|
|
7
7
|
import { userAuthorizationHint } from './lark-cli-error.js';
|
|
8
8
|
function verifiedUserIdentity(env) {
|
|
@@ -13,7 +13,7 @@ function verifiedUserIdentity(env) {
|
|
|
13
13
|
if (!isMissingLarkCommand(error, 'auth'))
|
|
14
14
|
throw error;
|
|
15
15
|
}
|
|
16
|
-
const response = runLarkCli(['api', 'GET', '/open-apis/authen/v1/user_info'], env);
|
|
16
|
+
const response = runLarkCli(['api', 'GET', '/open-apis/authen/v1/user_info', '--as', 'user'], env);
|
|
17
17
|
const user = responseData(response);
|
|
18
18
|
if ((user.code !== undefined && user.code !== 0) ||
|
|
19
19
|
typeof user.open_id !== 'string' ||
|
|
@@ -53,7 +53,10 @@ function isNotConfigured(error) {
|
|
|
53
53
|
export function ensureConfiguration(env, runner = runCommand) {
|
|
54
54
|
const executable = resolveLarkCliExecutable(env);
|
|
55
55
|
try {
|
|
56
|
-
runner(executable, ['config', 'show'], {
|
|
56
|
+
runner(executable, ['config', 'show'], {
|
|
57
|
+
env: larkCliEnvironment(env),
|
|
58
|
+
capture: true,
|
|
59
|
+
});
|
|
57
60
|
}
|
|
58
61
|
catch (error) {
|
|
59
62
|
// A dangling named profile is not permission to replace the default configuration.
|
|
@@ -62,7 +65,9 @@ export function ensureConfiguration(env, runner = runCommand) {
|
|
|
62
65
|
if (!isNotConfigured(error))
|
|
63
66
|
throw error;
|
|
64
67
|
process.stderr.write('lark-cli is not configured for this environment; starting first-time setup...\n');
|
|
65
|
-
runner(executable, ['config', 'init', '--new'], {
|
|
68
|
+
runner(executable, ['config', 'init', '--new'], {
|
|
69
|
+
env: larkCliEnvironment(env),
|
|
70
|
+
});
|
|
66
71
|
}
|
|
67
72
|
}
|
|
68
73
|
export async function login(profile = ONLINE_RUNTIME_PROFILE, larkProfile, json = false) {
|
|
@@ -77,11 +82,11 @@ export async function login(profile = ONLINE_RUNTIME_PROFILE, larkProfile, json
|
|
|
77
82
|
'--scope',
|
|
78
83
|
APPMODE_SCOPES.join(','),
|
|
79
84
|
...(json ? ['--json'] : []),
|
|
80
|
-
], { env });
|
|
85
|
+
], { env: larkCliEnvironment(env) });
|
|
81
86
|
}
|
|
82
87
|
export async function logout(profile = ONLINE_RUNTIME_PROFILE, larkProfile, json = false) {
|
|
83
88
|
const { env } = resolveLarkProfileEnvironment(await authEnvironment(profile, larkProfile), undefined, undefined, profile);
|
|
84
|
-
runCommand(resolveLarkCliExecutable(env), ['auth', 'logout', ...(json ? ['--json'] : [])], { env });
|
|
89
|
+
runCommand(resolveLarkCliExecutable(env), ['auth', 'logout', ...(json ? ['--json'] : [])], { env: larkCliEnvironment(env) });
|
|
85
90
|
}
|
|
86
91
|
export async function whoami(profile = ONLINE_RUNTIME_PROFILE, larkProfile) {
|
|
87
92
|
const { env } = resolveLarkProfileEnvironment(await authEnvironment(profile, larkProfile), undefined, undefined, profile);
|
|
@@ -106,8 +111,10 @@ export async function doctor(profile = ONLINE_RUNTIME_PROFILE, selectedLarkProfi
|
|
|
106
111
|
for (const diagnostic of sdkCompatibility)
|
|
107
112
|
process.stderr.write(diagnostic.message + '\n');
|
|
108
113
|
const { env, larkProfile } = resolveLarkProfileEnvironment(await authEnvironment(profile, selectedLarkProfile), undefined, undefined, profile);
|
|
109
|
-
const
|
|
110
|
-
|
|
114
|
+
const selectedIdentity = resolveLarkIdentity(env);
|
|
115
|
+
// TAT cannot call user_info, and Bot diagnosis must not depend on a UAT.
|
|
116
|
+
const identity = selectedIdentity === 'user' ? verifiedUserIdentity(env) : undefined;
|
|
117
|
+
const identityData = identity?.data;
|
|
111
118
|
const user = identityData?.identities?.user;
|
|
112
119
|
const managed = Boolean(env.LARKSUITE_CLI_AUTH_PROXY || user?.source === 'user_info');
|
|
113
120
|
// Reuse verified auth status; do not add a permission probe to business commands.
|
|
@@ -131,19 +138,33 @@ export async function doctor(profile = ONLINE_RUNTIME_PROFILE, selectedLarkProfi
|
|
|
131
138
|
'/open-apis/base/v3/sites/list',
|
|
132
139
|
'--params',
|
|
133
140
|
'{"pageSize":1}',
|
|
141
|
+
'--as',
|
|
142
|
+
selectedIdentity,
|
|
134
143
|
], env);
|
|
135
144
|
return {
|
|
136
145
|
ok: true,
|
|
137
146
|
environment: profile.name,
|
|
147
|
+
identity: selectedIdentity,
|
|
138
148
|
...(larkProfile ? { larkProfile } : {}),
|
|
139
149
|
node: process.version,
|
|
140
150
|
sdkCompatibility,
|
|
151
|
+
// This proves service access for the selected identity, not all write scopes.
|
|
152
|
+
serviceAccess: {
|
|
153
|
+
status: 'verified',
|
|
154
|
+
source: '/open-apis/base/v3/sites/list',
|
|
155
|
+
},
|
|
141
156
|
userScopes: {
|
|
142
|
-
status:
|
|
143
|
-
|
|
157
|
+
status: selectedIdentity === 'bot'
|
|
158
|
+
? 'not_applicable'
|
|
159
|
+
: managed
|
|
160
|
+
? 'host_managed'
|
|
161
|
+
: granted
|
|
162
|
+
? 'verified'
|
|
163
|
+
: 'unavailable',
|
|
164
|
+
required: selectedIdentity === 'bot' ? [] : APPMODE_SCOPES,
|
|
144
165
|
},
|
|
145
166
|
user: {
|
|
146
|
-
status: user?.status,
|
|
167
|
+
status: selectedIdentity === 'bot' ? 'not_applicable' : user?.status,
|
|
147
168
|
available: user?.available,
|
|
148
169
|
verified: user?.verified,
|
|
149
170
|
...(user?.source ? { source: user.source } : {}),
|
package/dist/auth.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.js","sourceRoot":"","sources":["../src/auth.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACrC,OAAO,EACL,qBAAqB,EACrB,qBAAqB,GAEtB,MAAM,wBAAwB,CAAC;AAEhC,OAAO,EAAE,gBAAgB,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAC3D,OAAO,EACL,2BAA2B,EAC3B,sBAAsB,GAEvB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EACL,wBAAwB,EACxB,UAAU,EACV,4BAA4B,EAC5B,6BAA6B,EAC7B,oBAAoB,EACpB,YAAY,
|
|
1
|
+
{"version":3,"file":"auth.js","sourceRoot":"","sources":["../src/auth.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"build-info.d.ts","sourceRoot":"","sources":["../src/build-info.ts"],"names":[],"mappings":"AAIA,wBAAgB,eAAe,CAC7B,IAAI,EAAE,MAAM,EACZ,GAAG,EAAE,MAAM,EACX,OAAO,CAAC,EAAE,MAAM,GACf,MAAM,CA6CR;AAQD,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAWlE"}
|
|
@@ -0,0 +1,63 @@
|
|
|
1
|
+
import { lstatSync, readFileSync } from 'node:fs';
|
|
2
|
+
import { parse } from 'parse5';
|
|
3
|
+
import { sourceCliVersion } from './source-format.js';
|
|
4
|
+
export function injectBuildInfo(html, cli, builder) {
|
|
5
|
+
const document = parse(html, { sourceCodeLocationInfo: true });
|
|
6
|
+
const edits = [];
|
|
7
|
+
let headEnd;
|
|
8
|
+
const visit = (node) => {
|
|
9
|
+
if ('tagName' in node) {
|
|
10
|
+
if (node.tagName === 'head')
|
|
11
|
+
headEnd = node.sourceCodeLocation?.startTag?.endOffset;
|
|
12
|
+
if (node.tagName === 'meta' &&
|
|
13
|
+
node.attrs.some(({ name, value }) => name === 'name' && value === 'base-site-build')) {
|
|
14
|
+
const location = node.sourceCodeLocation;
|
|
15
|
+
if (location)
|
|
16
|
+
edits.push({
|
|
17
|
+
start: location.startOffset,
|
|
18
|
+
end: location.endOffset,
|
|
19
|
+
text: '',
|
|
20
|
+
});
|
|
21
|
+
}
|
|
22
|
+
}
|
|
23
|
+
if ('childNodes' in node)
|
|
24
|
+
node.childNodes.forEach(visit);
|
|
25
|
+
};
|
|
26
|
+
visit(document);
|
|
27
|
+
if (headEnd === undefined)
|
|
28
|
+
throw new Error('Cannot locate an explicit HTML head');
|
|
29
|
+
// Escape the HTML attribute while retaining JSON's value after DOM decoding.
|
|
30
|
+
const content = JSON.stringify({
|
|
31
|
+
cli,
|
|
32
|
+
...(builder === undefined ? {} : { builder }),
|
|
33
|
+
})
|
|
34
|
+
.replaceAll('&', '&')
|
|
35
|
+
.replaceAll("'", ''')
|
|
36
|
+
.replaceAll('<', '<')
|
|
37
|
+
.replaceAll('>', '>');
|
|
38
|
+
edits.push({
|
|
39
|
+
start: headEnd,
|
|
40
|
+
end: headEnd,
|
|
41
|
+
text: `<meta name="base-site-build" content='${content}'>`,
|
|
42
|
+
});
|
|
43
|
+
for (const edit of edits.sort((a, b) => b.start - a.start || b.end - a.end))
|
|
44
|
+
html = html.slice(0, edit.start) + edit.text + html.slice(edit.end);
|
|
45
|
+
return html;
|
|
46
|
+
}
|
|
47
|
+
function warn() {
|
|
48
|
+
process.stderr.write('Warning: Could not inject base-site-build metadata into index.html; continuing without build metadata.\n');
|
|
49
|
+
}
|
|
50
|
+
export function readBuildInfoHtml(path) {
|
|
51
|
+
try {
|
|
52
|
+
if (!lstatSync(path).isFile())
|
|
53
|
+
throw new Error('HTML entry is not a regular file');
|
|
54
|
+
// The cloud page builder version is unknown here. Never substitute the
|
|
55
|
+
// vendored server builder version for the builder that runs in the cloud.
|
|
56
|
+
return injectBuildInfo(readFileSync(path, 'utf8'), sourceCliVersion());
|
|
57
|
+
}
|
|
58
|
+
catch {
|
|
59
|
+
warn();
|
|
60
|
+
return undefined;
|
|
61
|
+
}
|
|
62
|
+
}
|
|
63
|
+
//# sourceMappingURL=build-info.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"build-info.js","sourceRoot":"","sources":["../src/build-info.ts"],"names":[],"mappings":"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"}
|
package/dist/dev-url.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dev-url.d.ts","sourceRoot":"","sources":["../src/dev-url.ts"],"names":[],"mappings":"AACA,uFAAuF;AACvF,eAAO,MAAM,SAAS,UAGrB,CAAC;AAEF,wBAAgB,cAAc,CAC5B,UAAU,EAAE,MAAM,EAClB,IAAI,EAAE,MAAM,EACZ,UAAU,CAAC,EAAE,MAAM,EACnB,YAAY,CAAC,EAAE,MAAM,GACpB,MAAM,
|
|
1
|
+
{"version":3,"file":"dev-url.d.ts","sourceRoot":"","sources":["../src/dev-url.ts"],"names":[],"mappings":"AACA,uFAAuF;AACvF,eAAO,MAAM,SAAS,UAGrB,CAAC;AAEF,wBAAgB,cAAc,CAC5B,UAAU,EAAE,MAAM,EAClB,IAAI,EAAE,MAAM,EACZ,UAAU,CAAC,EAAE,MAAM,EACnB,YAAY,CAAC,EAAE,MAAM,GACpB,MAAM,CAqCR"}
|
package/dist/dev-url.js
CHANGED
|
@@ -5,11 +5,14 @@ export function developmentUrl(baseAppUrl, port, hostOrigin, pairingToken) {
|
|
|
5
5
|
if (!DEV_PORTS.includes(port))
|
|
6
6
|
throw new Error('DEV_PORT_INVALID: Only ports 43100-43109 are supported.');
|
|
7
7
|
const url = new URL(baseAppUrl);
|
|
8
|
+
// The host may hand out either the legacy /baseapp/{token} entry or the studio entry /baseapp/studio/{token};
|
|
9
|
+
// each keeps its own development route (/baseapp/dev or /baseapp/studio/dev).
|
|
10
|
+
const [, studio = '', siteToken] = url.pathname.match(/^\/baseapp\/(studio\/)?([^/]+)\/?$/) ?? [];
|
|
8
11
|
if (url.protocol !== 'https:' ||
|
|
9
12
|
url.username ||
|
|
10
13
|
url.password ||
|
|
11
|
-
|
|
12
|
-
['home', 'new', 'static', 'dev'].includes(decodeURIComponent(
|
|
14
|
+
!siteToken ||
|
|
15
|
+
['home', 'new', 'static', 'dev', 'studio'].includes(decodeURIComponent(siteToken).toLowerCase()))
|
|
13
16
|
throw new Error('DEV_BASE_APP_URL_INVALID: An HTTPS host application URL is required.');
|
|
14
17
|
if (hostOrigin) {
|
|
15
18
|
const host = new URL(hostOrigin);
|
|
@@ -20,8 +23,7 @@ export function developmentUrl(baseAppUrl, port, hostOrigin, pairingToken) {
|
|
|
20
23
|
throw new Error('DEV_HOST_ORIGIN_INVALID: An exact HTTPS origin is required.');
|
|
21
24
|
url.host = host.host;
|
|
22
25
|
}
|
|
23
|
-
|
|
24
|
-
url.pathname = `/baseapp/dev/${siteToken}/${port}`;
|
|
26
|
+
url.pathname = `/baseapp/${studio}dev/${siteToken}/${port}`;
|
|
25
27
|
url.search = '';
|
|
26
28
|
url.hash = pairingToken ? `t=${pairingToken}` : '';
|
|
27
29
|
return url.href;
|
package/dist/dev-url.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dev-url.js","sourceRoot":"","sources":["../src/dev-url.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,oCAAoC,CAAC;AACzE,uFAAuF;AACvF,MAAM,CAAC,MAAM,SAAS,GAAG,KAAK,CAAC,IAAI,CACjC,EAAE,MAAM,EAAE,mBAAmB,CAAC,OAAO,GAAG,mBAAmB,CAAC,OAAO,GAAG,CAAC,EAAE,EACzE,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,CAAC,mBAAmB,CAAC,OAAO,GAAG,KAAK,CAClD,CAAC;AAEF,MAAM,UAAU,cAAc,CAC5B,UAAkB,EAClB,IAAY,EACZ,UAAmB,EACnB,YAAqB;IAErB,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC;QAC3B,MAAM,IAAI,KAAK,CAAC,yDAAyD,CAAC,CAAC;IAC7E,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,UAAU,CAAC,CAAC;IAChC,
|
|
1
|
+
{"version":3,"file":"dev-url.js","sourceRoot":"","sources":["../src/dev-url.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,oCAAoC,CAAC;AACzE,uFAAuF;AACvF,MAAM,CAAC,MAAM,SAAS,GAAG,KAAK,CAAC,IAAI,CACjC,EAAE,MAAM,EAAE,mBAAmB,CAAC,OAAO,GAAG,mBAAmB,CAAC,OAAO,GAAG,CAAC,EAAE,EACzE,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,CAAC,mBAAmB,CAAC,OAAO,GAAG,KAAK,CAClD,CAAC;AAEF,MAAM,UAAU,cAAc,CAC5B,UAAkB,EAClB,IAAY,EACZ,UAAmB,EACnB,YAAqB;IAErB,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC;QAC3B,MAAM,IAAI,KAAK,CAAC,yDAAyD,CAAC,CAAC;IAC7E,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,UAAU,CAAC,CAAC;IAChC,8GAA8G;IAC9G,8EAA8E;IAC9E,MAAM,CAAC,EAAE,MAAM,GAAG,EAAE,EAAE,SAAS,CAAC,GAC9B,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,oCAAoC,CAAC,IAAI,EAAE,CAAC;IACjE,IACE,GAAG,CAAC,QAAQ,KAAK,QAAQ;QACzB,GAAG,CAAC,QAAQ;QACZ,GAAG,CAAC,QAAQ;QACZ,CAAC,SAAS;QACV,CAAC,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,QAAQ,CAAC,CAAC,QAAQ,CACjD,kBAAkB,CAAC,SAAS,CAAC,CAAC,WAAW,EAAE,CAC5C;QAED,MAAM,IAAI,KAAK,CACb,sEAAsE,CACvE,CAAC;IACJ,IAAI,UAAU,EAAE,CAAC;QACf,MAAM,IAAI,GAAG,IAAI,GAAG,CAAC,UAAU,CAAC,CAAC;QACjC,IACE,IAAI,CAAC,QAAQ,KAAK,QAAQ;YAC1B,IAAI,CAAC,MAAM,KAAK,UAAU;YAC1B,IAAI,CAAC,QAAQ;YACb,IAAI,CAAC,QAAQ;YAEb,MAAM,IAAI,KAAK,CACb,6DAA6D,CAC9D,CAAC;QACJ,GAAG,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC;IACvB,CAAC;IACD,GAAG,CAAC,QAAQ,GAAG,YAAY,MAAM,OAAO,SAAS,IAAI,IAAI,EAAE,CAAC;IAC5D,GAAG,CAAC,MAAM,GAAG,EAAE,CAAC;IAChB,GAAG,CAAC,IAAI,GAAG,YAAY,CAAC,CAAC,CAAC,KAAK,YAAY,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IACnD,OAAO,GAAG,CAAC,IAAI,CAAC;AAClB,CAAC"}
|
package/dist/lark-cli.d.ts
CHANGED
|
@@ -9,6 +9,9 @@ export declare function setExplicitIdentity(identity: string | undefined): void;
|
|
|
9
9
|
export declare function resetLarkIdentityForTests(): void;
|
|
10
10
|
export declare function resolveLarkIdentity(env: NodeJS.ProcessEnv, cwd?: string): LarkIdentity;
|
|
11
11
|
export declare function currentCliUserOpenId(env: NodeJS.ProcessEnv, cwd?: string): string | undefined;
|
|
12
|
+
/** Set from Commander's parsed command, never from raw argv or business inputs. */
|
|
13
|
+
export declare function setLarkCliAgentTrace(version: string, command: string): void;
|
|
14
|
+
export declare function larkCliEnvironment(env: NodeJS.ProcessEnv): NodeJS.ProcessEnv;
|
|
12
15
|
export interface RunLarkCliOptions {
|
|
13
16
|
passthroughFailures?: boolean;
|
|
14
17
|
}
|
package/dist/lark-cli.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lark-cli.d.ts","sourceRoot":"","sources":["../src/lark-cli.ts"],"names":[],"mappings":"AAoCA,OAAO,EAGL,KAAK,cAAc,EACpB,MAAM,kBAAkB,CAAC;AAE1B,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAKhD,wBAAgB,aAAa,CAAC,QAAQ,EAAE,aAAa,GAAG,OAAO,CAE9D;AAmCD,wBAAgB,oBAAoB,CAClC,KAAK,EAAE,OAAO,EACd,OAAO,EAAE,QAAQ,GAAG,MAAM,GACzB,OAAO,CAMT;AAsGD,wBAAgB,wBAAwB,CACtC,GAAG,EAAE,MAAM,CAAC,UAAU,EACtB,GAAG,GAAE,MAAsB,EAC3B,QAAQ,GAAE,MAAM,CAAC,QAA2B,GAC3C,MAAM,CA8CR;AAGD,QAAA,MAAM,kBAAkB,YAAI,MAAM,EAAE,KAAK,CAAU,CAAC;AACpD,MAAM,MAAM,YAAY,GAAG,CAAC,OAAO,kBAAkB,CAAC,CAAC,MAAM,CAAC,CAAC;AAU/D,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,CAOtE;AAED,wBAAgB,yBAAyB,IAAI,IAAI,CAIhD;AA6CD,wBAAgB,mBAAmB,CACjC,GAAG,EAAE,MAAM,CAAC,UAAU,EACtB,GAAG,CAAC,EAAE,MAAM,GACX,YAAY,CA0Bd;AAID,wBAAgB,oBAAoB,CAClC,GAAG,EAAE,MAAM,CAAC,UAAU,EACtB,GAAG,CAAC,EAAE,MAAM,GACX,MAAM,GAAG,SAAS,CASpB;
|
|
1
|
+
{"version":3,"file":"lark-cli.d.ts","sourceRoot":"","sources":["../src/lark-cli.ts"],"names":[],"mappings":"AAoCA,OAAO,EAGL,KAAK,cAAc,EACpB,MAAM,kBAAkB,CAAC;AAE1B,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAKhD,wBAAgB,aAAa,CAAC,QAAQ,EAAE,aAAa,GAAG,OAAO,CAE9D;AAmCD,wBAAgB,oBAAoB,CAClC,KAAK,EAAE,OAAO,EACd,OAAO,EAAE,QAAQ,GAAG,MAAM,GACzB,OAAO,CAMT;AAsGD,wBAAgB,wBAAwB,CACtC,GAAG,EAAE,MAAM,CAAC,UAAU,EACtB,GAAG,GAAE,MAAsB,EAC3B,QAAQ,GAAE,MAAM,CAAC,QAA2B,GAC3C,MAAM,CA8CR;AAGD,QAAA,MAAM,kBAAkB,YAAI,MAAM,EAAE,KAAK,CAAU,CAAC;AACpD,MAAM,MAAM,YAAY,GAAG,CAAC,OAAO,kBAAkB,CAAC,CAAC,MAAM,CAAC,CAAC;AAU/D,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,CAOtE;AAED,wBAAgB,yBAAyB,IAAI,IAAI,CAIhD;AA6CD,wBAAgB,mBAAmB,CACjC,GAAG,EAAE,MAAM,CAAC,UAAU,EACtB,GAAG,CAAC,EAAE,MAAM,GACX,YAAY,CA0Bd;AAID,wBAAgB,oBAAoB,CAClC,GAAG,EAAE,MAAM,CAAC,UAAU,EACtB,GAAG,CAAC,EAAE,MAAM,GACX,MAAM,GAAG,SAAS,CASpB;AAyCD,mFAAmF;AACnF,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,IAAI,CAE3E;AAED,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,MAAM,CAAC,UAAU,GAAG,MAAM,CAAC,UAAU,CAmB5E;AAED,MAAM,WAAW,iBAAiB;IAGhC,mBAAmB,CAAC,EAAE,OAAO,CAAC;CAC/B;AAED,wBAAgB,UAAU,CACxB,IAAI,EAAE,MAAM,EAAE,EACd,GAAG,EAAE,MAAM,CAAC,UAAU,EACtB,GAAG,CAAC,EAAE,MAAM,EACZ,KAAK,CAAC,EAAE,MAAM,EACd,OAAO,GAAE,iBAAsB,GAC9B,aAAa,CA0Ff;AA+OD,wBAAgB,4BAA4B,CAC1C,MAAM,EAAE,MAAM,CAAC,UAAU,EACzB,QAAQ,CAAC,EAAE,MAAM,EACjB,UAAU,CAAC,EAAE,MAAM,GAClB,MAAM,CAAC,UAAU,CAcnB;AAYD,wBAAgB,6BAA6B,CAC3C,MAAM,EAAE,MAAM,CAAC,UAAU,EACzB,QAAQ,CAAC,EAAE,MAAM,EACjB,UAAU,CAAC,EAAE,MAAM,EACnB,cAAc,CAAC,EAAE,cAAc,GAC9B;IAAE,GAAG,EAAE,MAAM,CAAC,UAAU,CAAC;IAAC,WAAW,CAAC,EAAE,MAAM,CAAA;CAAE,CAwDlD;AAkED,wBAAsB,iBAAiB,CACrC,IAAI,EAAE,MAAM,EAAE,EACd,OAAO,GAAE,cAAuC,EAChD,WAAW,CAAC,EAAE,MAAM,GACnB,OAAO,CAAC,IAAI,CAAC,CAuCf;AAED,wBAAgB,YAAY,CAAC,QAAQ,EAAE,aAAa,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAK7E;AAED,wBAAgB,gBAAgB,CAC9B,MAAM,EAAE,KAAK,GAAG,MAAM,EACtB,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,MAAM,EACd,GAAG,EAAE,MAAM,CAAC,UAAU,EACtB,GAAG,CAAC,EAAE,MAAM,GACX,IAAI,CAqCN"}
|