@weapp-tailwindcss/hbuilderx-runner 0.0.2 → 0.0.3
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/dist/index.cjs +13 -6
- package/dist/index.d.ts +3 -3
- package/dist/index.mjs +10 -4
- package/package.json +2 -1
package/dist/index.cjs
CHANGED
|
@@ -22,12 +22,12 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
|
|
|
22
22
|
}) : target, mod));
|
|
23
23
|
//#endregion
|
|
24
24
|
let node_fs_promises = require("node:fs/promises");
|
|
25
|
-
node_fs_promises = __toESM(node_fs_promises);
|
|
25
|
+
node_fs_promises = __toESM(node_fs_promises, 1);
|
|
26
26
|
let node_child_process = require("node:child_process");
|
|
27
27
|
let node_path = require("node:path");
|
|
28
|
-
node_path = __toESM(node_path);
|
|
28
|
+
node_path = __toESM(node_path, 1);
|
|
29
29
|
let node_process = require("node:process");
|
|
30
|
-
node_process = __toESM(node_process);
|
|
30
|
+
node_process = __toESM(node_process, 1);
|
|
31
31
|
//#region src/fs.ts
|
|
32
32
|
async function fileExists(file) {
|
|
33
33
|
try {
|
|
@@ -507,14 +507,20 @@ function resolveHdcCommand(env = node_process.default.env) {
|
|
|
507
507
|
"如需指定设备,请设置 E2E_HBUILDERX_HARMONY_DEVICE_ID 或 DEMO_VISUAL_HARMONY_DEVICE_ID。"
|
|
508
508
|
].join("\n"));
|
|
509
509
|
}
|
|
510
|
-
function
|
|
510
|
+
function parseHdcTargets(output) {
|
|
511
|
+
return output.split(/\r?\n/).map((line) => line.trim()).filter((line) => line.length > 0 && !/^\[empty\]$/i.test(line));
|
|
512
|
+
}
|
|
513
|
+
function assertHarmonyToolchain(env = node_process.default.env, deviceId) {
|
|
511
514
|
const hdc = resolveHdcCommand(env);
|
|
512
515
|
const result = runTool(hdc, ["list", "targets"]);
|
|
513
|
-
|
|
516
|
+
const targets = result.ok ? parseHdcTargets(result.output) : [];
|
|
517
|
+
if (!result.ok || targets.length === 0 || deviceId && !targets.includes(deviceId)) {
|
|
514
518
|
const issue = classifyHBuilderXOutput(result.output);
|
|
515
519
|
throw new Error([
|
|
516
520
|
"当前 Harmony hdc 无法列出设备,无法运行 HBuilderX app-harmony E2E。",
|
|
517
|
-
result.output || `exit=${result.status} signal=${result.signal ?? "none"}`,
|
|
521
|
+
result.output || `targets=empty exit=${result.status} signal=${result.signal ?? "none"}`,
|
|
522
|
+
`requestedDevice=${deviceId ?? "任意已连接设备"}`,
|
|
523
|
+
`detectedTargets=${targets.join(", ") || "empty"}`,
|
|
518
524
|
`issue=${issue.kind}: ${issue.message}`,
|
|
519
525
|
"请确认 Harmony 模拟器或真机已连接。"
|
|
520
526
|
].join("\n"));
|
|
@@ -545,6 +551,7 @@ exports.hbuilderxPnpmArgs = hbuilderxPnpmArgs;
|
|
|
545
551
|
exports.killProcessTree = killProcessTree;
|
|
546
552
|
exports.launchProject = launchProject;
|
|
547
553
|
exports.openProject = openProject;
|
|
554
|
+
exports.parseHdcTargets = parseHdcTargets;
|
|
548
555
|
exports.prepareProject = prepareProject;
|
|
549
556
|
exports.readUtf8 = readUtf8;
|
|
550
557
|
exports.resolveAdbCommand = resolveAdbCommand;
|
package/dist/index.d.ts
CHANGED
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import { ChildProcess } from "node:child_process";
|
|
2
2
|
import { Buffer } from "node:buffer";
|
|
3
|
-
|
|
4
3
|
//#region src/fs.d.ts
|
|
5
4
|
declare function fileExists(file: string): Promise<boolean>;
|
|
6
5
|
declare function readUtf8(file: string): Promise<string>;
|
|
@@ -139,6 +138,7 @@ declare function resolveAdbCommand(env?: NodeJS.ProcessEnv): AndroidToolchain;
|
|
|
139
138
|
declare function assertAndroidToolchain(env?: NodeJS.ProcessEnv): Record<string, string> | undefined;
|
|
140
139
|
declare function assertIosSimulatorToolchain(env?: NodeJS.ProcessEnv): void;
|
|
141
140
|
declare function resolveHdcCommand(env?: NodeJS.ProcessEnv): string;
|
|
142
|
-
declare function
|
|
141
|
+
declare function parseHdcTargets(output: string): string[];
|
|
142
|
+
declare function assertHarmonyToolchain(env?: NodeJS.ProcessEnv, deviceId?: string): string;
|
|
143
143
|
//#endregion
|
|
144
|
-
export { AndroidToolchain, CommandExit, HBuilderXAppPlatform, HBuilderXCliResolution, HBuilderXCliResolutionSource, HBuilderXCommandError, HBuilderXCommandOptions, HBuilderXCommandResult, HBuilderXIssue, HBuilderXIssueKind, HBuilderXLaunchOptions, HBuilderXMiniProgramPlatform, HBuilderXPlatform, HBuilderXProjectOptions, SpawnedHBuilderXCommand, ToolResult, assertAndroidToolchain, assertHarmonyToolchain, assertIosSimulatorToolchain, classifyHBuilderXOutput, closeProject, collectProcessOutput, createHBuilderXEnv, createLaunchArgs, createLogBuffer, createProcessExitTracker, createTimeoutIssue, extractHBuilderXExecutableFromProcessOutput, extractHBuilderXMacOSExecutable, extractHBuilderXWindowsExecutable, fileExists, findRunningHBuilderXCli, formatRecentLogs, getDefaultHBuilderXCliCandidates, hbuilderxPnpmArgs, killProcessTree, launchProject, openProject, prepareProject, readUtf8, resolveAdbCommand, resolveHBuilderXCli, resolveHBuilderXCliInfo, resolveHdcCommand, runCommand, runPnpmCommand, runTool, spawnCommand, spawnPnpmCommand, startLaunch, wait };
|
|
144
|
+
export { AndroidToolchain, CommandExit, HBuilderXAppPlatform, HBuilderXCliResolution, HBuilderXCliResolutionSource, HBuilderXCommandError, HBuilderXCommandOptions, HBuilderXCommandResult, HBuilderXIssue, HBuilderXIssueKind, HBuilderXLaunchOptions, HBuilderXMiniProgramPlatform, HBuilderXPlatform, HBuilderXProjectOptions, SpawnedHBuilderXCommand, ToolResult, assertAndroidToolchain, assertHarmonyToolchain, assertIosSimulatorToolchain, classifyHBuilderXOutput, closeProject, collectProcessOutput, createHBuilderXEnv, createLaunchArgs, createLogBuffer, createProcessExitTracker, createTimeoutIssue, extractHBuilderXExecutableFromProcessOutput, extractHBuilderXMacOSExecutable, extractHBuilderXWindowsExecutable, fileExists, findRunningHBuilderXCli, formatRecentLogs, getDefaultHBuilderXCliCandidates, hbuilderxPnpmArgs, killProcessTree, launchProject, openProject, parseHdcTargets, prepareProject, readUtf8, resolveAdbCommand, resolveHBuilderXCli, resolveHBuilderXCliInfo, resolveHdcCommand, runCommand, runPnpmCommand, runTool, spawnCommand, spawnPnpmCommand, startLaunch, wait };
|
package/dist/index.mjs
CHANGED
|
@@ -481,14 +481,20 @@ function resolveHdcCommand(env = process.env) {
|
|
|
481
481
|
"如需指定设备,请设置 E2E_HBUILDERX_HARMONY_DEVICE_ID 或 DEMO_VISUAL_HARMONY_DEVICE_ID。"
|
|
482
482
|
].join("\n"));
|
|
483
483
|
}
|
|
484
|
-
function
|
|
484
|
+
function parseHdcTargets(output) {
|
|
485
|
+
return output.split(/\r?\n/).map((line) => line.trim()).filter((line) => line.length > 0 && !/^\[empty\]$/i.test(line));
|
|
486
|
+
}
|
|
487
|
+
function assertHarmonyToolchain(env = process.env, deviceId) {
|
|
485
488
|
const hdc = resolveHdcCommand(env);
|
|
486
489
|
const result = runTool(hdc, ["list", "targets"]);
|
|
487
|
-
|
|
490
|
+
const targets = result.ok ? parseHdcTargets(result.output) : [];
|
|
491
|
+
if (!result.ok || targets.length === 0 || deviceId && !targets.includes(deviceId)) {
|
|
488
492
|
const issue = classifyHBuilderXOutput(result.output);
|
|
489
493
|
throw new Error([
|
|
490
494
|
"当前 Harmony hdc 无法列出设备,无法运行 HBuilderX app-harmony E2E。",
|
|
491
|
-
result.output || `exit=${result.status} signal=${result.signal ?? "none"}`,
|
|
495
|
+
result.output || `targets=empty exit=${result.status} signal=${result.signal ?? "none"}`,
|
|
496
|
+
`requestedDevice=${deviceId ?? "任意已连接设备"}`,
|
|
497
|
+
`detectedTargets=${targets.join(", ") || "empty"}`,
|
|
492
498
|
`issue=${issue.kind}: ${issue.message}`,
|
|
493
499
|
"请确认 Harmony 模拟器或真机已连接。"
|
|
494
500
|
].join("\n"));
|
|
@@ -496,4 +502,4 @@ function assertHarmonyToolchain(env = process.env) {
|
|
|
496
502
|
return hdc;
|
|
497
503
|
}
|
|
498
504
|
//#endregion
|
|
499
|
-
export { HBuilderXCommandError, assertAndroidToolchain, assertHarmonyToolchain, assertIosSimulatorToolchain, classifyHBuilderXOutput, closeProject, collectProcessOutput, createHBuilderXEnv, createLaunchArgs, createLogBuffer, createProcessExitTracker, createTimeoutIssue, extractHBuilderXExecutableFromProcessOutput, extractHBuilderXMacOSExecutable, extractHBuilderXWindowsExecutable, fileExists, findRunningHBuilderXCli, formatRecentLogs, getDefaultHBuilderXCliCandidates, hbuilderxPnpmArgs, killProcessTree, launchProject, openProject, prepareProject, readUtf8, resolveAdbCommand, resolveHBuilderXCli, resolveHBuilderXCliInfo, resolveHdcCommand, runCommand, runPnpmCommand, runTool, spawnCommand, spawnPnpmCommand, startLaunch, wait };
|
|
505
|
+
export { HBuilderXCommandError, assertAndroidToolchain, assertHarmonyToolchain, assertIosSimulatorToolchain, classifyHBuilderXOutput, closeProject, collectProcessOutput, createHBuilderXEnv, createLaunchArgs, createLogBuffer, createProcessExitTracker, createTimeoutIssue, extractHBuilderXExecutableFromProcessOutput, extractHBuilderXMacOSExecutable, extractHBuilderXWindowsExecutable, fileExists, findRunningHBuilderXCli, formatRecentLogs, getDefaultHBuilderXCliCandidates, hbuilderxPnpmArgs, killProcessTree, launchProject, openProject, parseHdcTargets, prepareProject, readUtf8, resolveAdbCommand, resolveHBuilderXCli, resolveHBuilderXCliInfo, resolveHdcCommand, runCommand, runPnpmCommand, runTool, spawnCommand, spawnPnpmCommand, startLaunch, wait };
|
package/package.json
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@weapp-tailwindcss/hbuilderx-runner",
|
|
3
|
-
"
|
|
3
|
+
"type": "module",
|
|
4
|
+
"version": "0.0.3",
|
|
4
5
|
"description": "Stable HBuilderX CLI runner utilities for weapp-tailwindcss local e2e workflows.",
|
|
5
6
|
"author": "ice breaker <1324318532@qq.com>",
|
|
6
7
|
"license": "MIT",
|