listpage_cli 0.0.296 → 0.0.298

package/bin/adapters/cli-interaction.js

@@ -134,18 +134,46 @@ async function askOverwrite() {
     }
     return (0, interaction_result_1.interactionValue)(result.value.ok);
 }
+const HELP_ANSI = {
+    reset: "\u001b[0m",
+    dim: "\u001b[2m",
+    cyan: "\u001b[36m",
+    green: "\u001b[32m",
+    yellow: "\u001b[33m",
+};
+const HELP_USE_COLOR = process.env.NO_COLOR === undefined;
+function helpColor(text, color) {
+    if (!HELP_USE_COLOR) {
+        return text;
+    }
+    return `${HELP_ANSI[color]}${text}${HELP_ANSI.reset}`;
+}
 function printHelp() {
     const h = [
-        "用法: listpage_cli init",
-        "说明: 进入中文引导式交互，按提示填写即可",
-        "用法: listpage_cli install-skill [skillName] [--project]",
-        "说明: 安装技能到 Cursor。默认 skillName 为 test，安装到当前命令执行目录的 .cursor/skills/",
-        "用法: listpage_cli build-project",
-        "说明: 非交互校验当前目录是否为有效项目根（需存在 listpage.config.json）",
-        "用法: listpage_cli release-project [tag] [--profile dev] [--platform linux/amd64] [--env KEY=VALUE]",
-        "说明: 先校验 .listpage/output 产物，再按 login/build/tag/push 执行 Docker 发布；参数优先级: CLI > profile > base",
-        "用法: listpage_cli deploy-project [tag] [--profile dev] [--platform linux/amd64] [--env KEY=VALUE]",
-        "说明: 使用 docker.remote + docker.container 执行部署，支持 ports[] 与 envFile/env 合并；参数优先级: CLI > profile > base",
+        helpColor("listpage_cli 命令说明", "cyan"),
+        "",
+        `  ${helpColor("init", "green")}`,
+        `    用法: ${helpColor("listpage_cli init", "dim")}`,
+        "    说明: 进入中文引导式交互，按提示填写即可",
+        "",
+        `  ${helpColor("install-skill", "green")}`,
+        `    用法: ${helpColor("listpage_cli install-skill [skillName] [--project]", "dim")}`,
+        "    说明: 安装技能到 Cursor；默认 skillName 为 test，安装到当前命令执行目录的 .cursor/skills/",
+        "",
+        `  ${helpColor("build-project", "green")}`,
+        `    用法: ${helpColor("listpage_cli build-project", "dim")}`,
+        "    说明: 非交互校验当前目录是否为有效项目根（需存在 listpage.config.json）",
+        "",
+        `  ${helpColor("release-project", "green")}`,
+        `    用法: ${helpColor("listpage_cli release-project [tag] [--profile dev] [--platform linux/amd64] [--env KEY=VALUE]", "dim")}`,
+        "    说明: 先校验 .listpage/output 产物，再按 login/build/tag/push 执行 Docker 发布",
+        `    备注: ${helpColor("参数优先级为 CLI > profile > base", "yellow")}`,
+        "",
+        `  ${helpColor("deploy-project", "green")}`,
+        `    用法: ${helpColor("listpage_cli deploy-project [tag] [--profile dev] [--platform linux/amd64] [--env KEY=VALUE] [--skip-image]", "dim")}`,
+        "    说明: 使用 docker.remote + docker.container 执行部署，支持 ports[] 与 envFile/env 合并",
+        `    备注: ${helpColor("默认会清理并拉取镜像；传入 --skip-image 时只执行容器相关步骤（假定镜像已是最新且已存在）", "yellow")}`,
+        `          ${helpColor("参数优先级为 CLI > profile > base", "yellow")}`,
     ].join("\n");
     console.log(h);
 }

package/bin/app/parse-args.js

@@ -46,10 +46,12 @@ function parseCommandOptions(rawArgs) {
     const platform = readSingleOption(args, "platform");
     const envEntries = readMultiOption(args, "env");
     const env = parseEnvEntries(envEntries);
+    const skipImage = args.includes("--skip-image");
     return {
         profile,
         platform,
         env: Object.keys(env).length > 0 ? env : undefined,
+        skipImage: skipImage || undefined,
     };
 }
 function parseCommandPositionals(rawArgs) {

package/bin/commands/deploy-project-command.js

@@ -19,6 +19,7 @@ function createDeployProjectCommandHandler(deps) {
         return (0, deploy_project_service_1.runDeployProjectFlow)({
             ...deps,
             cliOverrides,
+            skipImage: options.skipImage === true,
         });
     };
 }

package/bin/services/config-loader.js

@@ -55,11 +55,19 @@ function readConfigText(reader, configPath) {
     }
 }
 function validateRequiredFields(config, configPath) {
-    const frontend = config.frontend;
-    if (!Array.isArray(frontend) || frontend.length === 0) {
+    const artifacts = config.artifacts;
+    // v1.1 配置：存在 artifacts 时，不再强制校验顶层 frontend/backend 必填，
+    // 仅对 artifacts.copyFiles 做结构校验，避免对新配置形态误报。
+    if (artifacts && typeof artifacts === "object" && !Array.isArray(artifacts)) {
+        validateCopyFiles(artifacts, configPath);
+        return;
+    }
+    // 旧配置形态（无 artifacts）：保持原有必填校验以兼容历史行为
+    const legacyFrontend = config.frontend;
+    if (!Array.isArray(legacyFrontend) || legacyFrontend.length === 0) {
         throw new ConfigLoaderError("CONFIG_REQUIRED_FIELD_MISSING", configPath, `[${exports.CONFIG_LOADER_STAGE}][CONFIG_REQUIRED_FIELD_MISSING] 配置缺少必填字段: frontend (至少包含一个构建项)`);
     }
-    frontend.forEach((item, index) => {
+    legacyFrontend.forEach((item, index) => {
         const projectDir = getNestedString({ frontend: item }, "frontend.projectDir");
         if (!projectDir) {
             throw new ConfigLoaderError("CONFIG_REQUIRED_FIELD_MISSING", configPath, `[${exports.CONFIG_LOADER_STAGE}][CONFIG_REQUIRED_FIELD_MISSING] 配置缺少必填字段: frontend[${index}].projectDir`);

package/bin/services/deploy-project-service.js

@@ -90,6 +90,7 @@ async function runDeployProjectFlow(deps) {
         executionInput,
         resolve: deps.fs.resolve,
         readText: deps.fs.readText,
+        skipImage: deps.skipImage === true,
     });
 }
 function resolveRuntimeConfig(config, cliOverrides) {
@@ -142,28 +143,6 @@ async function runDockerDeploy(input) {
     const { client, executionInput } = input;
     const remoteImage = executionInput.remoteImage;
     logDeployStep("run", `开始部署镜像: ${remoteImage}`);
-    try {
-        logDeployStep("run", `检查本地镜像是否存在: ${remoteImage}`);
-        const exists = await client.imageExists(remoteImage);
-        logDeployStep("run", `本地镜像检查结果: exists=${exists ? "yes" : "no"}`);
-        if (exists) {
-            logDeployStep("run", `删除旧镜像: ${remoteImage}`);
-            await client.removeImage(remoteImage);
-            logDeployStep("run", `旧镜像删除完成: ${remoteImage}`);
-        }
-    }
-    catch (error) {
-        return (0, command_result_1.commandError)(`[${DEPLOY_STAGE}][run] 清理镜像缓存失败: ${toErrorMessage(error)}`, command_result_1.COMMAND_ERROR_CODES.executionFailed, 1);
-    }
-    try {
-        const auth = buildPullAuth(executionInput.docker);
-        logDeployStep("run", `开始拉取镜像: ${remoteImage} (auth=${auth ? "yes" : "no"})`);
-        await client.pullImage(remoteImage, auth);
-        logDeployStep("run", `镜像拉取完成: ${remoteImage}`);
-    }
-    catch (error) {
-        return (0, command_result_1.commandError)(`[${DEPLOY_STAGE}][run] 拉取镜像失败: ${toErrorMessage(error)}`, command_result_1.COMMAND_ERROR_CODES.executionFailed, 1);
-    }
     try {
         logDeployStep("run", `检查已有容器: ${executionInput.runtime.containerName}`);
         const existingContainerId = await client.findContainerIdByName(executionInput.runtime.containerName);
@@ -179,6 +158,33 @@ async function runDockerDeploy(input) {
     catch (error) {
         return (0, command_result_1.commandError)(`[${DEPLOY_STAGE}][run] 替换容器失败: ${toErrorMessage(error)}`, command_result_1.COMMAND_ERROR_CODES.executionFailed, 1);
     }
+    if (input.skipImage !== true) {
+        try {
+            logDeployStep("run", `检查本地镜像是否存在: ${remoteImage}`);
+            const exists = await client.imageExists(remoteImage);
+            logDeployStep("run", `本地镜像检查结果: exists=${exists ? "yes" : "no"}`);
+            if (exists) {
+                logDeployStep("run", `删除旧镜像: ${remoteImage}`);
+                await client.removeImage(remoteImage);
+                logDeployStep("run", `旧镜像删除完成: ${remoteImage}`);
+            }
+        }
+        catch (error) {
+            return (0, command_result_1.commandError)(`[${DEPLOY_STAGE}][run] 清理镜像缓存失败: ${toErrorMessage(error)}`, command_result_1.COMMAND_ERROR_CODES.executionFailed, 1);
+        }
+        try {
+            const auth = buildPullAuth(executionInput.docker);
+            logDeployStep("run", `开始拉取镜像: ${remoteImage} (auth=${auth ? "yes" : "no"})`);
+            await client.pullImage(remoteImage, auth);
+            logDeployStep("run", `镜像拉取完成: ${remoteImage}`);
+        }
+        catch (error) {
+            return (0, command_result_1.commandError)(`[${DEPLOY_STAGE}][run] 拉取镜像失败: ${toErrorMessage(error)}`, command_result_1.COMMAND_ERROR_CODES.executionFailed, 1);
+        }
+    }
+    else {
+        logDeployStep("run", `跳过镜像处理: 按照 --skip-image 假定镜像已存在且为最新`);
+    }
     let createContainerInput;
     try {
         createContainerInput = (0, dockerode_client_1.toRuntimeContainerInput)({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "listpage_cli",
-  "version": "0.0.296",
+  "version": "0.0.298",
   "private": false,
   "bin": {
     "listpage_cli": "bin/cli.js"

package/templates/backend-template/package.json.tmpl

@@ -25,7 +25,7 @@
     "class-transformer": "^0.5.1",
     "class-validator": "~0.14.2",
     "rxjs": "^7.8.1",
-    "listpage-next-nest": "~0.0.296"
+    "listpage-next-nest": "~0.0.298"
   },
   "devDependencies": {
     "@nestjs/schematics": "^11.0.0",

package/templates/frontend-template/package.json.tmpl

@@ -12,7 +12,7 @@
   "dependencies": {
     "react": "^19.2.0",
     "react-dom": "^19.2.0",
-    "listpage-next": "~0.0.296",
+    "listpage-next": "~0.0.298",
     "react-router-dom": ">=6.0.0",
     "@ant-design/v5-patch-for-react-19": "~1.0.3",
     "ahooks": "^3.9.5",
@@ -23,7 +23,7 @@
     "styled-components": "^6.1.19",
     "mobx": "~6.15.0",
     "@ant-design/icons": "~6.0.2",
-    "listpage-components": "~0.0.296",
+    "listpage-components": "~0.0.298",
     "lucide-react": "~0.575.0"
     "mobx-react-lite": "~4.1.1"
   },