listpage_cli 0.0.310 → 0.0.311

package/bin/adapters/cli-interaction.js

@@ -160,17 +160,15 @@ function printHelp() {
         `    用法: ${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("project", "green")}`,
+        `    用法: ${helpColor("listpage_cli project build", "dim")}`,
+        "    说明: 非交互校验当前目录是否为有效项目根（需存在 listpage.config.json），构建并写入 .listpage/output",
         "",
-        `  ${helpColor("release-project", "green")}`,
-        `    用法: ${helpColor("listpage_cli release-project [tag] [--profile dev] [--platform linux/amd64] [--env KEY=VALUE]", "dim")}`,
+        `    用法: ${helpColor("listpage_cli project release [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")}`,
+        `    用法: ${helpColor("listpage_cli project deploy [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")}`,

package/bin/app/parse-args.js

@@ -1,16 +1,25 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.cliOptionArgStartIndex = cliOptionArgStartIndex;
+exports.parseProjectTailPositionals = parseProjectTailPositionals;
 exports.parseArgs = parseArgs;
 exports.parseCommandOptions = parseCommandOptions;
 exports.parseCommandPositionals = parseCommandPositionals;
 const KNOWN_COMMANDS = new Set([
     "init",
     "install-skill",
-    "build-project",
-    "release-project",
-    "deploy-project",
+    "project",
     "lark",
 ]);
+function cliOptionArgStartIndex(command) {
+    return 1;
+}
+/**
+ * `project <sub> [tag] ...` 中，子命令之后的位置参数（如 release/deploy 的镜像 tag）。
+ */
+function parseProjectTailPositionals(rawArgs) {
+    return parseCommandPositionals(rawArgs, "project").slice(1);
+}
 function parseArgs(argv) {
     const rawArgs = [...argv];
     const commandToken = rawArgs[0];
@@ -41,8 +50,8 @@ function parseArgs(argv) {
         positionals,
     };
 }
-function parseCommandOptions(rawArgs) {
-    const args = rawArgs.slice(1);
+function parseCommandOptions(rawArgs, command) {
+    const args = rawArgs.slice(cliOptionArgStartIndex(command));
     const profile = readSingleOption(args, "profile");
     const platform = readSingleOption(args, "platform");
     const envEntries = readMultiOption(args, "env");
@@ -55,8 +64,8 @@ function parseCommandOptions(rawArgs) {
         skipImage: skipImage || undefined,
     };
 }
-function parseCommandPositionals(rawArgs) {
-    const args = rawArgs.slice(1);
+function parseCommandPositionals(rawArgs, command) {
+    const args = rawArgs.slice(cliOptionArgStartIndex(command));
     const positionals = [];
     const optionsWithValue = new Set(["--profile", "--platform", "--env"]);
     for (let index = 0; index < args.length; index += 1) {

package/bin/cli.js

@@ -6,9 +6,7 @@ const execute_1 = require("./app/execute");
 const command_result_1 = require("./domain/command-result");
 const init_command_1 = require("./commands/init-command");
 const install_skill_command_1 = require("./commands/install-skill-command");
-const build_project_command_1 = require("./commands/build-project-command");
-const release_project_command_1 = require("./commands/release-project-command");
-const deploy_project_command_1 = require("./commands/deploy-project-command");
+const project_command_1 = require("./commands/project-command");
 const lark_command_1 = require("./commands/lark-command");
 const node_fs_adapter_1 = require("./adapters/node-fs-adapter");
 const filesystem_capability_service_1 = require("./services/filesystem-capability-service");
@@ -33,14 +31,10 @@ const installSkillCommandHandler = (0, install_skill_command_1.createInstallSkil
         defaultSkillName: "test",
     },
 });
-const buildProjectCommandHandler = (0, build_project_command_1.createBuildProjectCommandHandler)({
-    fs: fsAdapter,
-});
-const releaseProjectCommandHandler = (0, release_project_command_1.createReleaseProjectCommandHandler)({
-    fs: fsAdapter,
-});
-const deployProjectCommandHandler = (0, deploy_project_command_1.createDeployProjectCommandHandler)({
-    fs: fsAdapter,
+const projectCommandHandler = (0, project_command_1.createProjectCommandHandler)({
+    build: { fs: fsAdapter },
+    release: { fs: fsAdapter },
+    deploy: { fs: fsAdapter },
 });
 const larkCommandHandler = (0, lark_command_1.createLarkCommandHandler)({
     fs: fsAdapter,
@@ -52,9 +46,7 @@ async function main() {
         handlers: {
             init: initCommandHandler,
             "install-skill": installSkillCommandHandler,
-            "build-project": buildProjectCommandHandler,
-            "release-project": releaseProjectCommandHandler,
-            "deploy-project": deployProjectCommandHandler,
+            project: projectCommandHandler,
             lark: larkCommandHandler,
         },
     });

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

@@ -5,11 +5,11 @@ const parse_args_1 = require("../app/parse-args");
 const deploy_project_service_1 = require("../services/deploy-project-service");
 function createDeployProjectCommandHandler(deps) {
     return async (input) => {
-        const firstPositional = (0, parse_args_1.parseCommandPositionals)(input.rawArgs)[0];
+        const firstPositional = (0, parse_args_1.parseProjectTailPositionals)(input.rawArgs)[0];
         const tag = typeof firstPositional === "string" && firstPositional.trim() !== ""
             ? firstPositional.trim()
             : undefined;
-        const options = (0, parse_args_1.parseCommandOptions)(input.rawArgs);
+        const options = (0, parse_args_1.parseCommandOptions)(input.rawArgs, "project");
         const cliOverrides = {
             tag,
             profile: options.profile,

package/bin/commands/project-command.js

@@ -0,0 +1,25 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createProjectCommandHandler = createProjectCommandHandler;
+const command_result_1 = require("../domain/command-result");
+const build_project_command_1 = require("./build-project-command");
+const release_project_command_1 = require("./release-project-command");
+const deploy_project_command_1 = require("./deploy-project-command");
+function createProjectCommandHandler(deps) {
+    const build = (0, build_project_command_1.createBuildProjectCommandHandler)(deps.build);
+    const release = (0, release_project_command_1.createReleaseProjectCommandHandler)(deps.release);
+    const deploy = (0, deploy_project_command_1.createDeployProjectCommandHandler)(deps.deploy);
+    return async (input) => {
+        const subCommand = input.positionals[0];
+        switch (subCommand) {
+            case "build":
+                return build(input);
+            case "release":
+                return release(input);
+            case "deploy":
+                return deploy(input);
+            default:
+                return (0, command_result_1.commandError)("错误: 未知的子命令。目前仅支持: build, release, deploy", "invalid_subcommand", 1);
+        }
+    };
+}

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

@@ -5,11 +5,11 @@ const parse_args_1 = require("../app/parse-args");
 const release_project_service_1 = require("../services/release-project-service");
 function createReleaseProjectCommandHandler(deps) {
     return async (input) => {
-        const firstPositional = (0, parse_args_1.parseCommandPositionals)(input.rawArgs)[0];
+        const firstPositional = (0, parse_args_1.parseProjectTailPositionals)(input.rawArgs)[0];
         const tag = typeof firstPositional === "string" && firstPositional.trim() !== ""
             ? firstPositional.trim()
             : undefined;
-        const options = (0, parse_args_1.parseCommandOptions)(input.rawArgs);
+        const options = (0, parse_args_1.parseCommandOptions)(input.rawArgs, "project");
         const cliOverrides = {
             tag,
             profile: options.profile,

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

@@ -76,13 +76,36 @@ function getBuildTargets(projectRoot, config) {
         projectDir: resolveBuildTarget(projectRoot, item.projectDir),
     }));
 }
+function resolveArtifactsBuildSlice(config) {
+    const artifacts = config.artifacts;
+    if (artifacts && typeof artifacts === "object" && !Array.isArray(artifacts)) {
+        const a = artifacts;
+        return {
+            frontend: a.frontend ?? config.frontend,
+            backend: a.backend ?? config.backend,
+            copyFiles: a.copyFiles ?? config.copyFiles,
+        };
+    }
+    return {
+        frontend: config.frontend,
+        backend: config.backend,
+        copyFiles: config.copyFiles,
+    };
+}
 function toBuildProjectConfig(config) {
-    const frontendRaw = config.frontend;
-    const backendRaw = config.backend;
+    const slice = resolveArtifactsBuildSlice(config);
+    const frontendRaw = slice.frontend;
+    if (!Array.isArray(frontendRaw) || frontendRaw.length === 0) {
+        throw new Error("配置字段无效: frontend (至少包含一个构建项)");
+    }
+    const backendRaw = slice.backend;
+    if (!backendRaw || typeof backendRaw !== "object" || Array.isArray(backendRaw)) {
+        throw new Error("配置字段无效: backend");
+    }
     return {
         frontend: frontendRaw.map((item) => toBuildTarget(item)),
         backend: toBuildTarget(backendRaw),
-        copyFiles: toCopySpecs(config.copyFiles),
+        copyFiles: toCopySpecs(slice.copyFiles),
     };
 }
 function toBuildTarget(item) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "listpage_cli",
-  "version": "0.0.310",
+  "version": "0.0.311",
   "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.310"
+    "listpage-next-nest": "~0.0.311"
   },
   "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.310",
+    "listpage-next": "~0.0.311",
     "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.310",
+    "listpage-components": "~0.0.311",
     "lucide-react": "~0.575.0"
     "mobx-react-lite": "~4.1.1"
   },