@lynxship/cli 0.1.7 → 0.1.10

package/dist/target-toolchain.js

@@ -0,0 +1,122 @@
+import { existsSync, readFileSync } from "node:fs";
+import { join, resolve } from "node:path";
+import { commandExists } from "./process-runner.js";
+import { hasDesktopHost, resolveDesktopPackScript } from "./desktop-build.js";
+import { hasHarmonyHost, harmonyToolchain } from "./harmony-build.js";
+import { hasWebConfiguration } from "./web-build.js";
+import { inspectDesktopSigning } from "./desktop-signing.js";
+function check(name, status, value, fix) {
+    return { name, status, ok: status !== "fail", value, fix };
+}
+function packageManifest(root) {
+    try {
+        return JSON.parse(readFileSync(join(root, "package.json"), "utf8"));
+    }
+    catch {
+        return {};
+    }
+}
+function hasDependency(manifest, name) {
+    return Boolean(manifest.dependencies?.[name] || manifest.devDependencies?.[name]);
+}
+export async function inspectWebTarget(root, profile) {
+    const manifest = packageManifest(root);
+    const configured = hasWebConfiguration(root);
+    const customScript = Boolean(profile.web?.script || manifest.scripts?.["build:web"]);
+    const hasRspeedy = hasDependency(manifest, "@lynx-js/rspeedy");
+    const checks = [
+        check("web-configuration", configured ? "pass" : "fail", configured
+            ? "Lynx Web environment configured"
+            : "missing lynx.config.* or build:web script", configured
+            ? undefined
+            : "Configure environments.web in lynx.config.* or add a build:web script, then rerun lynxship doctor --platform web"),
+        check("web-build-tool", hasRspeedy || customScript ? "pass" : "fail", hasRspeedy
+            ? "@lynx-js/rspeedy detected"
+            : customScript
+                ? "project web build script detected"
+                : "@lynx-js/rspeedy not found", hasRspeedy || customScript
+            ? undefined
+            : "Install the project Lynx Web toolchain with the package manager, then rerun lynxship doctor --platform web"),
+        check("web-output", "warn", "dist/*.web.bundle is checked during the build", "Run lynxship build --platform web --profile production"),
+    ];
+    return { ok: checks.every((item) => item.status !== "fail"), checks };
+}
+function harmonySignTool(root, profile) {
+    const candidates = [
+        profile.harmony?.signTool
+            ? resolve(root, profile.harmony.signTool)
+            : undefined,
+        process.env.LYNXSHIP_HAP_SIGN_TOOL,
+        process.env.DEVECO_HAP_SIGN_TOOL,
+        process.env.HOS_SDK_HOME
+            ? join(process.env.HOS_SDK_HOME, "toolchains", "lib", "hap-sign-tool.jar")
+            : undefined,
+        process.env.DEVECO_SDK_HOME
+            ? join(process.env.DEVECO_SDK_HOME, "toolchains", "lib", "hap-sign-tool.jar")
+            : undefined,
+    ].filter((value) => Boolean(value));
+    return candidates.find((value) => existsSync(value));
+}
+export async function inspectHarmonyTarget(root, profile) {
+    const host = hasHarmonyHost(root);
+    const tools = harmonyToolchain(root);
+    const signTool = harmonySignTool(root, profile);
+    const checks = [
+        check("harmony-host", host ? "pass" : "fail", host
+            ? "Hvigor Harmony host found"
+            : "missing official harmony/ host files", host
+            ? undefined
+            : "Add the official Lynx Harmony host with harmony/hvigorw, hvigorfile.ts, build-profile.json5 and oh-package.json5"),
+        check("ohpm", tools.ohpm ? "pass" : "fail", tools.ohpm ? "ohpm detected" : "missing", tools.ohpm
+            ? undefined
+            : "Install DevEco Studio/OpenHarmony SDK and make ohpm available on PATH"),
+        check("harmony-java", commandExists("java") ? "pass" : "fail", commandExists("java") ? "Java detected" : "missing", commandExists("java")
+            ? undefined
+            : "Install the JDK required by the pinned DevEco/Hvigor project"),
+        check("hap-sign-tool", signTool ? "pass" : "fail", signTool ? "official hap-sign-tool.jar detected" : "missing", signTool
+            ? undefined
+            : "Set LYNXSHIP_HAP_SIGN_TOOL or build.<profile>.harmony.signTool to the official hap-sign-tool.jar"),
+        check("hdc", tools.hdc ? "pass" : "warn", tools.hdc
+            ? "hdc detected"
+            : "missing · required only for lynxship run/logs", tools.hdc
+            ? undefined
+            : "Install the OpenHarmony SDK platform tools before installing on a device"),
+    ];
+    return { ok: checks.every((item) => item.status !== "fail"), checks };
+}
+export async function inspectDesktopTarget(root, profile) {
+    const host = await hasDesktopHost(root, profile);
+    const manifest = packageManifest(root);
+    const builder = Boolean(resolveDesktopPackScript(manifest, profile)) ||
+        hasDependency(manifest, "@lynx-js/lynxtron-builder") ||
+        hasDependency(manifest, "electron-builder") ||
+        existsSync(join(root, "electron-builder.yml")) ||
+        existsSync(join(root, "electron-builder.yaml")) ||
+        existsSync(join(root, "electron-builder.json"));
+    const signing = await inspectDesktopSigning(root);
+    const checks = [
+        check("desktop-host", host ? "pass" : "fail", host
+            ? "Lynxtron/Electron desktop host found"
+            : "missing Lynxtron host or pack script", host
+            ? undefined
+            : "Use the official Lynxtron template and configure @lynx-js/lynxtron-builder, electron-builder.yml or a pack script"),
+        check("desktop-packager", builder ? "pass" : "fail", builder
+            ? "Lynxtron/Electron Builder packaging entry detected"
+            : "packaging entry not found", builder
+            ? undefined
+            : "Install @lynx-js/lynxtron-builder and add a pack script, then rerun lynxship doctor --platform desktop"),
+        check("desktop-platform", process.platform === "win32" || process.platform === "darwin"
+            ? "pass"
+            : "warn", process.platform === "win32" || process.platform === "darwin"
+            ? `${process.platform} desktop target`
+            : `${process.platform} host · verify the Lynxtron target explicitly`, process.platform === "win32" || process.platform === "darwin"
+            ? undefined
+            : "Run the desktop build on the target OS supported by the project’s Lynxtron/electron-builder configuration"),
+        check("desktop-signing", signing.status === "configured" || signing.status === "not-required"
+            ? "pass"
+            : signing.status === "unknown"
+                ? "warn"
+                : "fail", signing.value, signing.fix),
+    ];
+    return { ok: checks.every((item) => item.status !== "fail"), checks };
+}

package/dist/ui/components.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"components.d.ts","sourceRoot":"","sources":["../../src/ui/components.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAI7C,MAAM,WAAW,MAAM;IACrB,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,UAAU,CAAC,EAAE,SAAS,CAAC;CACxB;AAED,wBAAgB,aAAa,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAEjD;AAED,eAAO,MAAM,GAAG;qBACG,MAAM,GAAG,IAAI;kBAGhB,MAAM,GAAG,IAAI;mBAGZ,MAAM,GAAG,IAAI;kBAGd,MAAM,GAAG,IAAI;mBAGZ,MAAM,GAAG,IAAI;CAG7B,CAAC;AAgBF,wBAAgB,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,IAAI,CA6C9D;AAED,MAAM,WAAW,cAAc;IAC7B,KAAK,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,MAAM,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7C,IAAI,IAAI,IAAI,CAAC;CACd;AA6CD,wBAAgB,WAAW,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAoBnD;AAyBD,wBAAgB,cAAc,CAC5B,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,OAAO,GACf,cAAc,CAkEhB;AAED,MAAM,WAAW,aAAa;IAC5B,OAAO,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B,IAAI,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,IAAI,IAAI,IAAI,CAAC;CACd;AAED,wBAAgB,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,GAAG,aAAa,CA2BlE;AAYD,eAAO,MAAM,IAAI;oBACC,MAAM;iBACT,MAAM;iBACN,MAAM;kBACL,MAAM;CACrB,CAAC;AAEF,wBAAgB,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,UAAO,GAAG,IAAI,CAE/D;AAED,wBAAgB,SAAS,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,CAOjE;AAED,wBAAgB,gBAAgB,CAC9B,GAAG,EAAE,MAAM,EACX,SAAS,CAAC,EAAE,MAAM,EAClB,OAAO,UAAO,GACb,IAAI,CAQN"}
+{"version":3,"file":"components.d.ts","sourceRoot":"","sources":["../../src/ui/components.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAI7C,MAAM,WAAW,MAAM;IACrB,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,UAAU,CAAC,EAAE,SAAS,CAAC;CACxB;AAED,wBAAgB,aAAa,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAEjD;AAED,eAAO,MAAM,GAAG;qBACG,MAAM,GAAG,IAAI;kBAGhB,MAAM,GAAG,IAAI;mBAGZ,MAAM,GAAG,IAAI;kBAGd,MAAM,GAAG,IAAI;mBAGZ,MAAM,GAAG,IAAI;CAG7B,CAAC;AAgBF,wBAAgB,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,IAAI,CA6C9D;AAED,MAAM,WAAW,cAAc;IAC7B,KAAK,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,MAAM,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7C,IAAI,IAAI,IAAI,CAAC;CACd;AA6CD,wBAAgB,WAAW,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAoBnD;AA6BD,wBAAgB,cAAc,CAC5B,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,OAAO,GACf,cAAc,CAuEhB;AAED,MAAM,WAAW,aAAa;IAC5B,OAAO,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B,IAAI,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,IAAI,IAAI,IAAI,CAAC;CACd;AAED,wBAAgB,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,GAAG,aAAa,CA2BlE;AAYD,eAAO,MAAM,IAAI;oBACC,MAAM;iBACT,MAAM;iBACN,MAAM;kBACL,MAAM;CACrB,CAAC;AAEF,wBAAgB,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,UAAO,GAAG,IAAI,CAE/D;AAED,wBAAgB,SAAS,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,CAOjE;AAED,wBAAgB,gBAAgB,CAC9B,GAAG,EAAE,MAAM,EACX,SAAS,CAAC,EAAE,MAAM,EAClB,OAAO,UAAO,GACb,IAAI,CAQN"}

package/dist/ui/components.js

@@ -126,6 +126,9 @@ export function formatEvent(message) {
     }[tone];
     return `  ${colors[tone](marker)} ${colors[tone](normalized)}`;
 }
+function formatEventRail() {
+    return `  ${c.text(supportsUnicode() ? "│" : "|")}`;
+}
 const activeAnimations = new Set();
 let cleanupHooksInstalled = false;
 function installCleanupHooks() {
@@ -193,9 +196,12 @@ export function createProgress(label, enabled) {
             return;
         const tone = eventTone(message);
         bar.stop();
-        if (tone === "output" && previousTone === "output")
-            console.log();
+        if (tone !== "output" &&
+            (previousTone === undefined || previousTone === "output"))
+            console.log(formatEventRail());
         console.log(formatEvent(message));
+        if (tone !== "output")
+            console.log(formatEventRail());
         bar.start(100, currentValue, payload(currentLabel));
         previousTone = tone;
     };

package/dist/web-build.d.ts

@@ -0,0 +1,16 @@
+import { type BuildJob } from "@lynxship/contracts";
+import type { BuildProfile } from "./config.js";
+interface WebBuildOptions {
+    root: string;
+    profile: BuildProfile;
+    uploadArtifacts?: boolean;
+    skipBundleBuild?: boolean;
+    quiet?: boolean;
+    onEvent?: (message: string) => void;
+    onProgress?: (value?: number, label?: string) => void;
+}
+export declare function detectWebBuildScript(root: string): string | undefined;
+export declare function hasWebConfiguration(root: string): boolean;
+export declare function runRealWebBuild(job: BuildJob, options: WebBuildOptions): Promise<BuildJob>;
+export {};
+//# sourceMappingURL=web-build.d.ts.map

package/dist/web-build.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"web-build.d.ts","sourceRoot":"","sources":["../src/web-build.ts"],"names":[],"mappings":"AAGA,OAAO,EAAU,KAAK,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAE5D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAIhD,UAAU,eAAe;IACvB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,YAAY,CAAC;IACtB,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,OAAO,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;IACpC,UAAU,CAAC,EAAE,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC;CACvD;AAgBD,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAOrE;AAiCD,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAczD;AAED,wBAAsB,eAAe,CACnC,GAAG,EAAE,QAAQ,EACb,OAAO,EAAE,eAAe,GACvB,OAAO,CAAC,QAAQ,CAAC,CAsDnB"}

package/dist/web-build.js

@@ -0,0 +1,116 @@
+import { readdir } from "node:fs/promises";
+import { existsSync, readFileSync } from "node:fs";
+import { join, resolve } from "node:path";
+import { assert } from "@lynxship/contracts";
+import { transitionBuild } from "@lynxship/build-orchestrator";
+import { publishBuiltArtifact } from "./artifact-build.js";
+import { buildLynxBundle } from "./bundle-build.js";
+function readPackageManifest(root) {
+    try {
+        return JSON.parse(readFileSync(join(root, "package.json"), "utf8"));
+    }
+    catch {
+        return {};
+    }
+}
+export function detectWebBuildScript(root) {
+    const scripts = readPackageManifest(root).scripts;
+    if (!scripts)
+        return undefined;
+    for (const name of ["build:web", "build:web:production"]) {
+        if (scripts[name])
+            return name;
+    }
+    return undefined;
+}
+async function webBundle(root, profile) {
+    const configured = profile.web?.artifact;
+    if (configured) {
+        const file = resolve(root, configured);
+        assert(existsSync(file), "WEB_BUNDLE_MISSING", `Configured Web bundle was not found: ${file}`);
+        return file;
+    }
+    const candidates = [];
+    for (const directory of ["dist", "build/web", "build"]) {
+        const entries = await readdir(join(root, directory), {
+            withFileTypes: true,
+        }).catch(() => []);
+        for (const entry of entries) {
+            if (entry.isFile() && entry.name.endsWith(".web.bundle"))
+                candidates.push(join(root, directory, entry.name));
+        }
+    }
+    assert(candidates.length === 1, "WEB_BUNDLE_MISSING", candidates.length === 0
+        ? "Rspeedy did not produce a *.web.bundle in dist/, build/web/ or build/. Configure environments.web in lynx.config.* or set build.<profile>.web.artifact."
+        : "Rspeedy produced multiple *.web.bundle files. Set build.<profile>.web.artifact explicitly.");
+    return candidates[0];
+}
+export function hasWebConfiguration(root) {
+    const config = [
+        "lynx.config.ts",
+        "lynx.config.js",
+        "lynx.config.mjs",
+        "lynx.config.cjs",
+    ]
+        .map((file) => join(root, file))
+        .find((file) => existsSync(file));
+    if (config) {
+        const source = readFileSync(config, "utf8");
+        if (/environments[\s\S]{0,500}\bweb\b/i.test(source))
+            return true;
+    }
+    return Boolean(detectWebBuildScript(root));
+}
+export async function runRealWebBuild(job, options) {
+    const uploadArtifacts = options.uploadArtifacts ?? true;
+    const step = (message, value) => {
+        options.onEvent?.(message);
+        options.onProgress?.(value, message);
+    };
+    try {
+        transitionBuild(job, "uploading_source", "Web source prepared");
+        if (!options.skipBundleBuild) {
+            step("Building Lynx Web bundle with Rspeedy…", 10);
+            const script = options.profile.web?.script ?? detectWebBuildScript(options.root);
+            await buildLynxBundle(options.root, {
+                quiet: options.quiet,
+                onOutput: options.onEvent,
+                script,
+                rspeedyArgs: script
+                    ? undefined
+                    : ["--environment", options.profile.web?.environment ?? "web"],
+            });
+        }
+        else
+            step("Using existing Lynx Web bundle", 20);
+        const artifact = await webBundle(options.root, options.profile);
+        transitionBuild(job, "queued", "Web bundle queued locally");
+        transitionBuild(job, "provisioning", "Lynx Web environment selected");
+        transitionBuild(job, "installing_dependencies", "Web bundle verified");
+        transitionBuild(job, "building", "Web bundle created");
+        step("Lynx Web bundle ready", 70);
+        return await publishBuiltArtifact({
+            root: options.root,
+            job,
+            platform: "web",
+            artifactPath: artifact,
+            extension: "web.bundle",
+            contentType: "application/octet-stream",
+            uploadArtifacts,
+            verificationMessage: "Web bundle output verified",
+            quiet: options.quiet,
+            onEvent: options.onEvent,
+            onProgress: options.onProgress,
+        });
+    }
+    catch (error) {
+        if (!["success", "failed", "canceled", "timed_out"].includes(job.state))
+            transitionBuild(job, "failed", error instanceof Error ? error.message : "Web build failed");
+        job.logs.push({
+            level: "error",
+            message: error instanceof Error ? error.message : "Web build failed",
+            at: new Date().toISOString(),
+        });
+        throw error;
+    }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lynxship/cli",
-  "version": "0.1.7",
+  "version": "0.1.10",
   "description": "Build, sign, store, submit and update LynxJS applications from the terminal.",
   "type": "module",
   "license": "MIT",
@@ -69,10 +69,10 @@
     "ora": "8.2.0",
     "qrcode-terminal": "0.12.0",
     "@lynxship/build-orchestrator": "0.1.0",
-    "@lynxship/contracts": "0.1.0",
-    "@lynxship/signing": "0.1.0",
     "@lynxship/submit": "0.1.0",
-    "@lynxship/db": "0.1.0"
+    "@lynxship/db": "0.1.0",
+    "@lynxship/contracts": "0.1.0",
+    "@lynxship/signing": "0.1.0"
   },
   "devDependencies": {
     "@types/cli-progress": "3.11.6",