weapp-ide-cli 5.2.1 → 5.2.2

package/dist/{cli-DKrUhSmB.js → cli-1zieDX-6.js}

@@ -1,4 +1,4 @@
-import { B as createLocaleConfig, C as configureLocaleFromArgv, G as defaultCustomConfigFilePath, H as readCustomConfig, I as resolveCliPath, K as resolvePath, Q as logger_default, R as getConfiguredLocale, T as validateLocaleOption, U as removeCustomConfigKey, V as overwriteCustomConfig, X as operatingSystemName, Y as isOperatingSystemSupported, Z as colors, a as navigateBack, c as pageStack, d as remote, f as scrollTo, g as tap, i as input, l as reLaunch, m as systemInfo, n as captureScreenshotBuffer, o as navigateTo, p as switchTab, r as currentPage, s as pageData, t as audit, u as redirectTo, w as i18nText, y as connectMiniProgram, z as createCustomConfig } from "./commands--vppy2pX.js";
+import { B as createLocaleConfig, C as configureLocaleFromArgv, G as defaultCustomConfigFilePath, H as readCustomConfig, I as resolveCliPath, K as resolvePath, Q as logger_default, R as getConfiguredLocale, T as validateLocaleOption, U as removeCustomConfigKey, V as overwriteCustomConfig, X as operatingSystemName, Y as isOperatingSystemSupported, Z as colors, a as navigateBack, c as pageStack, d as remote, f as scrollTo, g as tap, i as input, l as reLaunch, m as systemInfo, n as captureScreenshotBuffer, o as navigateTo, p as switchTab, r as currentPage, s as pageData, t as audit, u as redirectTo, w as i18nText, y as connectMiniProgram, z as createCustomConfig } from "./commands-38LzU5ML.js";
 import fs from "node:fs/promises";
 import { fs as fs$1 } from "@weapp-core/shared";
 import process, { stdin, stdout } from "node:process";
@@ -402,7 +402,7 @@ async function runScreenshot(argv) {
 	}
 	const options = parseScreenshotArgs(argv);
 	const isJsonOutput = argv.includes("--json");
-	const { takeScreenshot } = await import("./commands-Bg8hQbPE.js");
+	const { takeScreenshot } = await import("./commands-msx1PSZ8.js");
 	const result = await takeScreenshot(options);
 	if (isJsonOutput) {
 		console.log(JSON.stringify(result, null, 2));

package/dist/cli.js

@@ -1,5 +1,5 @@
-import { Q as logger_default } from "./commands--vppy2pX.js";
-import { n as parse } from "./cli-DKrUhSmB.js";
+import { Q as logger_default } from "./commands-38LzU5ML.js";
+import { n as parse } from "./cli-1zieDX-6.js";
 import process from "node:process";
 //#region src/cli.ts
 const argv = process.argv.slice(2);

package/dist/{commands--vppy2pX.js → commands-38LzU5ML.js}

@@ -166,12 +166,16 @@ async function overwriteCustomConfig(config) {
 }
 //#endregion
 //#region src/config/resolver.ts
+function isCustomConfigJson(value) {
+	return typeof value === "object" && value !== null;
+}
 /**
 * @description 读取并解析 CLI 配置（自定义优先）
 */
 async function getConfig() {
 	if (await fs$1.pathExists(defaultCustomConfigFilePath)) try {
-		const config = await fs$1.readJSON(defaultCustomConfigFilePath);
+		const rawConfig = await fs$1.readJSON(defaultCustomConfigFilePath);
+		const config = isCustomConfigJson(rawConfig) ? rawConfig : {};
 		const cliPath = typeof config.cliPath === "string" ? config.cliPath.trim() : "";
 		const locale = config.locale === "zh" || config.locale === "en" ? config.locale : void 0;
 		if (cliPath) {
@@ -625,10 +629,14 @@ function cropPngRows(source, startRow, rowCount) {
 	for (let row = 0; row < rowCount; row += 1) {
 		const sourceStart = (startRow + row) * bytesPerRow;
 		const sourceEnd = sourceStart + bytesPerRow;
-		source.data.copy(cropped.data, row * bytesPerRow, sourceStart, sourceEnd);
+		cropped.data.set(source.data.subarray(sourceStart, sourceEnd), row * bytesPerRow);
 	}
 	return cropped;
 }
+async function restoreScrollPosition(miniProgram, page, scrollTop) {
+	await miniProgram.pageScrollTo(scrollTop);
+	await page.waitFor(150);
+}
 /**
 * @description 通过多次滚动和拼接生成整页长截图。
 */
@@ -637,6 +645,7 @@ async function captureFullPageScreenshotBuffer(options) {
 	const page = await miniProgram.currentPage();
 	const pageSize = await page.size();
 	const systemInfo = await miniProgram.systemInfo();
+	const initialScrollTop = typeof page.scrollTop === "function" ? await page.scrollTop() : 0;
 	const pageHeight = toPositiveNumber(pageSize.height);
 	const viewportHeight = toPositiveNumber(systemInfo.windowHeight);
 	if (!pageHeight || !viewportHeight) return decodeScreenshotBuffer(await runWithTimeout(miniProgram.screenshot(), timeoutMs, screenshotTimeoutMessage, "DEVTOOLS_SCREENSHOT_TIMEOUT"));
@@ -644,20 +653,24 @@ async function captureFullPageScreenshotBuffer(options) {
 	const positions = createScrollPositions(pageHeight, viewportHeight);
 	let coveredUntil = 0;
 	let scale = 1;
-	for (const scrollTop of positions) {
-		await miniProgram.pageScrollTo(scrollTop);
-		await page.waitFor(150);
-		const rawScreenshot = await runWithTimeout(miniProgram.screenshot(), timeoutMs, screenshotTimeoutMessage, "DEVTOOLS_SCREENSHOT_TIMEOUT");
-		const png = PNG.sync.read(decodeScreenshotBuffer(rawScreenshot));
-		if (viewportHeight > 0) scale = png.height / viewportHeight;
-		const visibleEnd = Math.min(scrollTop + viewportHeight, pageHeight);
-		const cropTopCss = Math.max(coveredUntil - scrollTop, 0);
-		const segmentHeightCss = Math.max(visibleEnd - scrollTop - cropTopCss, 0);
-		if (segmentHeightCss <= 0) continue;
-		const cropTopRows = Math.min(Math.max(Math.round(cropTopCss * scale), 0), png.height);
-		const segmentRows = Math.min(Math.max(Math.round(segmentHeightCss * scale), 1), png.height - cropTopRows);
-		segments.push(cropPngRows(png, cropTopRows, segmentRows));
-		coveredUntil = visibleEnd;
+	try {
+		for (const scrollTop of positions) {
+			await miniProgram.pageScrollTo(scrollTop);
+			await page.waitFor(150);
+			const rawScreenshot = await runWithTimeout(miniProgram.screenshot(), timeoutMs, screenshotTimeoutMessage, "DEVTOOLS_SCREENSHOT_TIMEOUT");
+			const png = PNG.sync.read(decodeScreenshotBuffer(rawScreenshot));
+			if (viewportHeight > 0) scale = png.height / viewportHeight;
+			const visibleEnd = Math.min(scrollTop + viewportHeight, pageHeight);
+			const cropTopCss = Math.max(coveredUntil - scrollTop, 0);
+			const segmentHeightCss = Math.max(visibleEnd - scrollTop - cropTopCss, 0);
+			if (segmentHeightCss <= 0) continue;
+			const cropTopRows = Math.min(Math.max(Math.round(cropTopCss * scale), 0), png.height);
+			const segmentRows = Math.min(Math.max(Math.round(segmentHeightCss * scale), 1), png.height - cropTopRows);
+			segments.push(cropPngRows(png, cropTopRows, segmentRows));
+			coveredUntil = visibleEnd;
+		}
+	} finally {
+		await restoreScrollPosition(miniProgram, page, initialScrollTop);
 	}
 	if (segments.length === 0) throw new Error("Failed to capture screenshot");
 	const width = segments[0].width;
@@ -672,7 +685,7 @@ async function captureFullPageScreenshotBuffer(options) {
 		for (let row = 0; row < segment.height; row += 1) {
 			const sourceStart = row * bytesPerRow;
 			const sourceEnd = sourceStart + bytesPerRow;
-			segment.data.copy(merged.data, (offsetY + row) * bytesPerRow, sourceStart, sourceEnd);
+			merged.data.set(segment.data.subarray(sourceStart, sourceEnd), (offsetY + row) * bytesPerRow);
 		}
 		offsetY += segment.height;
 	}

package/dist/commands-msx1PSZ8.js

@@ -0,0 +1,2 @@
+import { h as takeScreenshot } from "./commands-38LzU5ML.js";
+export { takeScreenshot };

package/dist/index.d.ts

@@ -1,8 +1,8 @@
 import { Buffer } from "node:buffer";
-import * as _weapp_vite_miniprogram_automator0 from "@weapp-vite/miniprogram-automator";
+import * as _$_weapp_vite_miniprogram_automator0 from "@weapp-vite/miniprogram-automator";
 import { Element, MiniProgram, Page } from "@weapp-vite/miniprogram-automator";
-import * as cac$1 from "cac";
-import * as execa from "execa";
+import * as _$cac from "cac";
+import * as _$execa from "execa";
 
 //#region src/cli/automator.d.ts
 interface AutomatorOptions {
@@ -51,7 +51,7 @@ declare function launchAutomator(options: AutomatorOptions): Promise<any>;
 /**
  * @description 连接当前项目已打开的开发者工具自动化会话，不触发新的 IDE 拉起。
  */
-declare function connectOpenedAutomator(options: AutomatorOptions): Promise<_weapp_vite_miniprogram_automator0.MiniProgram>;
+declare function connectOpenedAutomator(options: AutomatorOptions): Promise<_$_weapp_vite_miniprogram_automator0.MiniProgram>;
 //#endregion
 //#region src/cli/automator-argv.d.ts
 interface ParsedAutomatorArgs {
@@ -333,7 +333,7 @@ declare function formatRetryHotkeyPrompt(timeoutMs?: number): string;
 /**
  * @description 基于 cac 注册顶层命令，用于统一识别入口。
  */
-declare function createCli(): cac$1.CAC;
+declare function createCli(): _$cac.CAC;
 /**
  * @description CLI 入口解析与分发。
  */
@@ -499,7 +499,7 @@ interface ExecuteOptions {
 /**
  * @description 执行 CLI 命令并透传输出
  */
-declare function execute(cliPath: string, argv: string[], options?: ExecuteOptions): Promise<execa.Result<{}>>;
+declare function execute(cliPath: string, argv: string[], options?: ExecuteOptions): Promise<_$execa.Result<{}>>;
 //#endregion
 //#region src/utils/path.d.ts
 /**

package/dist/index.js

@@ -1,3 +1,3 @@
-import { A as isAutomatorProtocolTimeoutError, B as createLocaleConfig, D as formatAutomatorLoginError, E as connectOpenedAutomator, F as launchAutomator, G as defaultCustomConfigFilePath, H as readCustomConfig, I as resolveCliPath, J as getDefaultCliPath, K as resolvePath, L as getConfig, M as isDevtoolsExtensionContextInvalidatedError, N as isDevtoolsHttpPortError, O as getAutomatorProtocolTimeoutMethod, P as isRetryableAutomatorLaunchError, R as getConfiguredLocale, S as withMiniProgram, U as removeCustomConfigKey, V as overwriteCustomConfig, W as defaultCustomConfigDirPath, X as operatingSystemName, Y as isOperatingSystemSupported, _ as acquireSharedMiniProgram, a as navigateBack, b as getSharedMiniProgramSessionCount, c as pageStack, d as remote, f as scrollTo, g as tap, h as takeScreenshot, i as input, j as isAutomatorWsConnectError, k as isAutomatorLoginError, l as reLaunch, m as systemInfo, n as captureScreenshotBuffer, o as navigateTo, p as switchTab, q as SupportedPlatformsMap, r as currentPage, s as pageData, t as audit, u as redirectTo, v as closeSharedMiniProgram, x as releaseSharedMiniProgram, y as connectMiniProgram, z as createCustomConfig } from "./commands--vppy2pX.js";
-import { A as parseCompareArgs, C as isWeappIdeTopLevelCommand, D as runAutomatorCommand, E as isAutomatorCommand, M as parseAutomatorArgs, N as readOptionValue, O as parseScreenshotArgs, P as removeOption, S as WECHAT_CLI_COMMAND_NAMES, T as getAutomatorCommandHelp, _ as handleConfigCommand, a as createWechatIdeLoginRequiredExitError, b as MINIDEV_NAMESPACE_COMMAND_NAMES, c as formatWechatIdeLoginRequiredError, d as runMinidev, f as execute, g as startForwardConsole, h as transformArgv, i as runWechatCliWithRetry, j as printCompareHelp, k as printScreenshotHelp, l as isWechatIdeLoginRequiredError, m as createPathCompat, n as parse, o as extractExecutionErrorText, p as createAlias, r as validateWechatCliCommandArgs, s as formatRetryHotkeyPrompt, t as createCli, u as waitForRetryKeypress, v as promptForCliPath, w as AUTOMATOR_COMMAND_NAMES, x as WEAPP_IDE_TOP_LEVEL_COMMAND_NAMES, y as CONFIG_COMMAND_NAME } from "./cli-DKrUhSmB.js";
+import { A as isAutomatorProtocolTimeoutError, B as createLocaleConfig, D as formatAutomatorLoginError, E as connectOpenedAutomator, F as launchAutomator, G as defaultCustomConfigFilePath, H as readCustomConfig, I as resolveCliPath, J as getDefaultCliPath, K as resolvePath, L as getConfig, M as isDevtoolsExtensionContextInvalidatedError, N as isDevtoolsHttpPortError, O as getAutomatorProtocolTimeoutMethod, P as isRetryableAutomatorLaunchError, R as getConfiguredLocale, S as withMiniProgram, U as removeCustomConfigKey, V as overwriteCustomConfig, W as defaultCustomConfigDirPath, X as operatingSystemName, Y as isOperatingSystemSupported, _ as acquireSharedMiniProgram, a as navigateBack, b as getSharedMiniProgramSessionCount, c as pageStack, d as remote, f as scrollTo, g as tap, h as takeScreenshot, i as input, j as isAutomatorWsConnectError, k as isAutomatorLoginError, l as reLaunch, m as systemInfo, n as captureScreenshotBuffer, o as navigateTo, p as switchTab, q as SupportedPlatformsMap, r as currentPage, s as pageData, t as audit, u as redirectTo, v as closeSharedMiniProgram, x as releaseSharedMiniProgram, y as connectMiniProgram, z as createCustomConfig } from "./commands-38LzU5ML.js";
+import { A as parseCompareArgs, C as isWeappIdeTopLevelCommand, D as runAutomatorCommand, E as isAutomatorCommand, M as parseAutomatorArgs, N as readOptionValue, O as parseScreenshotArgs, P as removeOption, S as WECHAT_CLI_COMMAND_NAMES, T as getAutomatorCommandHelp, _ as handleConfigCommand, a as createWechatIdeLoginRequiredExitError, b as MINIDEV_NAMESPACE_COMMAND_NAMES, c as formatWechatIdeLoginRequiredError, d as runMinidev, f as execute, g as startForwardConsole, h as transformArgv, i as runWechatCliWithRetry, j as printCompareHelp, k as printScreenshotHelp, l as isWechatIdeLoginRequiredError, m as createPathCompat, n as parse, o as extractExecutionErrorText, p as createAlias, r as validateWechatCliCommandArgs, s as formatRetryHotkeyPrompt, t as createCli, u as waitForRetryKeypress, v as promptForCliPath, w as AUTOMATOR_COMMAND_NAMES, x as WEAPP_IDE_TOP_LEVEL_COMMAND_NAMES, y as CONFIG_COMMAND_NAME } from "./cli-1zieDX-6.js";
 export { AUTOMATOR_COMMAND_NAMES, CONFIG_COMMAND_NAME, MINIDEV_NAMESPACE_COMMAND_NAMES, SupportedPlatformsMap, WEAPP_IDE_TOP_LEVEL_COMMAND_NAMES, WECHAT_CLI_COMMAND_NAMES, acquireSharedMiniProgram, audit, captureScreenshotBuffer, closeSharedMiniProgram, connectMiniProgram, connectOpenedAutomator, createAlias, createCli, createCustomConfig, createLocaleConfig, createPathCompat, createWechatIdeLoginRequiredExitError, currentPage, defaultCustomConfigDirPath, defaultCustomConfigFilePath, execute, extractExecutionErrorText, formatAutomatorLoginError, formatRetryHotkeyPrompt, formatWechatIdeLoginRequiredError, getAutomatorCommandHelp, getAutomatorProtocolTimeoutMethod, getConfig, getConfiguredLocale, getDefaultCliPath, getSharedMiniProgramSessionCount, handleConfigCommand, input, isAutomatorCommand, isAutomatorLoginError, isAutomatorProtocolTimeoutError, isAutomatorWsConnectError, isDevtoolsExtensionContextInvalidatedError, isDevtoolsHttpPortError, isOperatingSystemSupported, isRetryableAutomatorLaunchError, isWeappIdeTopLevelCommand, isWechatIdeLoginRequiredError, launchAutomator, navigateBack, navigateTo, operatingSystemName, overwriteCustomConfig, pageData, pageStack, parse, parseAutomatorArgs, parseCompareArgs, parseScreenshotArgs, printCompareHelp, printScreenshotHelp, promptForCliPath, reLaunch, readCustomConfig, readOptionValue, redirectTo, releaseSharedMiniProgram, remote, removeCustomConfigKey, removeOption, resolveCliPath, resolvePath, runAutomatorCommand, runMinidev, runWechatCliWithRetry, scrollTo, startForwardConsole, switchTab, systemInfo, takeScreenshot, tap, transformArgv, validateWechatCliCommandArgs, waitForRetryKeypress, withMiniProgram };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "weapp-ide-cli",
   "type": "module",
-  "version": "5.2.1",
+  "version": "5.2.2",
   "description": "让微信开发者工具，用起来更加方便！",
   "author": "ice breaker <1324318532@qq.com>",
   "license": "MIT",

package/dist/commands-Bg8hQbPE.js

@@ -1,2 +0,0 @@
-import { h as takeScreenshot } from "./commands--vppy2pX.js";
-export { takeScreenshot };