@ykdz/template 0.0.37 → 0.0.40

package/dist/application.d.ts

@@ -1,27 +1,13 @@
 import { type GeneratedRepositoryPlan, type InitializationInputIssue, type PackageAdditionInputIssue, type NextStepInstruction, type ProjectBlueprint, type PublicationSetupHandoff, type ResolvedInitialization } from "@ykdz/template-builtin-presets";
 import { type ProjectProjectionAction, type ProjectProjectionConflict } from "@ykdz/template-core/project-projection";
-export type ConfirmationRequest = {
-    readonly message: string;
-    readonly prompt: string;
-};
 export type ApplicationRuntime = {
     readonly cwd: string;
     readonly env: Readonly<Record<string, string | undefined>>;
-    readonly tty: {
-        readonly stdin: boolean;
-        readonly stdout: boolean;
-        readonly stderr: boolean;
-    };
-    readonly confirmation: {
-        confirm(request: ConfirmationRequest): Promise<boolean>;
-    };
 };
 export type InitCommandOptions = {
     readonly dir: string;
     readonly preset: string;
-    readonly yes: boolean;
     readonly dryRun: boolean;
-    readonly json: boolean;
     readonly todo: boolean;
     readonly name?: string;
     readonly path?: string;
@@ -33,11 +19,8 @@ export type AddPackageCommandOptions = {
     readonly path?: string;
     readonly linkFrom: readonly string[];
     readonly dryRun: boolean;
-    readonly json: boolean;
 };
 export type InitCommandResult = {
-    readonly schemaVersion: 1;
-    readonly command: "init";
     readonly status: "success";
     readonly dryRun: boolean;
     readonly targetDir: string;
@@ -52,25 +35,11 @@ export type InitCommandResult = {
         readonly path?: string;
     };
 } | {
-    readonly schemaVersion: 1;
-    readonly command: "init";
-    readonly status: "cancelled";
-    readonly code: "CANCELLED";
-    readonly targetDir: string;
-} | {
-    readonly schemaVersion: 1;
-    readonly command: "init";
     readonly status: "usage-error";
-    readonly code: "USAGE_INIT_INVALID";
     readonly targetDir: string;
-    readonly issues: readonly (InitializationInputIssue | {
-        readonly code: "NON_INTERACTIVE_CONFIRMATION_REQUIRED";
-    })[];
+    readonly issues: readonly InitializationInputIssue[];
 } | {
-    readonly schemaVersion: 1;
-    readonly command: "init";
     readonly status: "operation-failure";
-    readonly code: "OPERATION_INIT_FAILED";
     readonly phase: "preset" | "planning" | "preflight" | "materialization" | "render";
     readonly targetDir: string;
     readonly error: {
@@ -84,31 +53,21 @@ type PresetCatalogEntry = {
     readonly description: string;
 };
 export type PresetCatalogCommandResult = {
-    readonly schemaVersion: 1;
-    readonly command: "presets";
     readonly status: "success";
     readonly presets: readonly PresetCatalogEntry[];
 };
 export type BlueprintValidationCommandResult = {
-    readonly schemaVersion: 1;
-    readonly command: "blueprint validate";
     readonly status: "success";
     readonly path: string;
 } | {
-    readonly schemaVersion: 1;
-    readonly command: "blueprint validate";
     readonly status: "invalid";
-    readonly code: "BLUEPRINT_INVALID";
     readonly path: string;
     readonly issues: readonly {
         readonly path: string;
         readonly message: string;
     }[];
 } | {
-    readonly schemaVersion: 1;
-    readonly command: "blueprint validate";
     readonly status: "operation-failure";
-    readonly code: "OPERATION_BLUEPRINT_READ_FAILED" | "OPERATION_BLUEPRINT_PARSE_FAILED";
     readonly path: string;
     readonly reason: "not-found" | "permission-denied" | "not-a-file" | "unreadable" | "invalid-json";
     readonly error: {
@@ -141,29 +100,19 @@ type PackageAdditionBusinessConflict = {
     };
 };
 export type PackageAdditionCommandResult = {
-    readonly schemaVersion: 1;
-    readonly command: "add package";
     readonly status: "success";
     readonly dryRun: boolean;
     readonly actions: readonly ProjectProjectionAction[];
 } | {
-    readonly schemaVersion: 1;
-    readonly command: "add package";
     readonly status: "conflict";
     readonly dryRun: boolean;
     readonly actions: readonly [];
     readonly conflicts: readonly (PackageAdditionCoreConflict | PackageAdditionBusinessConflict)[];
 } | {
-    readonly schemaVersion: 1;
-    readonly command: "add package";
     readonly status: "usage-error";
-    readonly code: "USAGE_ADD_PACKAGE_INVALID";
     readonly issues: readonly PackageAdditionInputIssue[];
 } | {
-    readonly schemaVersion: 1;
-    readonly command: "add package";
     readonly status: "operation-failure";
-    readonly code: "OPERATION_ADD_PACKAGE_FAILED";
     readonly phase: "metadata" | "default" | "planning" | "reconciliation";
     readonly error: {
         readonly message: string;

package/dist/application.js

@@ -7,8 +7,6 @@ import { releaseToolchainSnapshot } from "@ykdz/template-core/release-toolchain-
 import { renderNewProject } from "@ykdz/template-core/renderer";
 export function listPresetCatalog() {
     return {
-        schemaVersion: 1,
-        command: "presets",
         status: "success",
         presets: builtInPresetRegistry.all().map((definition) => ({
             name: definition.metadata.name,
@@ -26,10 +24,6 @@ function toolchainReport() {
         packageManagerPin: releaseToolchainSnapshot.packageManagerPin,
     };
 }
-function formatRows(rows) {
-    const width = Math.max(...rows.map(([label]) => `${label}:`.length));
-    return rows.map(([label, value]) => `  ${`${label}:`.padEnd(width)} ${value}`);
-}
 function packageAdditionConflict(conflict) {
     const { before, current, after, ...details } = conflict;
     return {
@@ -52,10 +46,7 @@ export async function validateBlueprintFile(filePath, runtime) {
     }
     catch {
         return {
-            schemaVersion: 1,
-            command: "blueprint validate",
             status: "operation-failure",
-            code: "OPERATION_BLUEPRINT_PARSE_FAILED",
             path: resolvedPath,
             reason: "invalid-json",
             error: {
@@ -67,17 +58,12 @@ export async function validateBlueprintFile(filePath, runtime) {
     const result = validateProjectBlueprint(value);
     if (!result.ok) {
         return {
-            schemaVersion: 1,
-            command: "blueprint validate",
             status: "invalid",
-            code: "BLUEPRINT_INVALID",
             path: resolvedPath,
             issues: result.issues,
         };
     }
     return {
-        schemaVersion: 1,
-        command: "blueprint validate",
         status: "success",
         path: resolvedPath,
     };
@@ -106,10 +92,7 @@ function readBlueprintFailure(filePath, error) {
                     "检查路径、文件权限和挂载状态后重试；若需要其他访问权限，请人工处理。",
                 ];
     return {
-        schemaVersion: 1,
-        command: "blueprint validate",
         status: "operation-failure",
-        code: "OPERATION_BLUEPRINT_READ_FAILED",
         path: filePath,
         reason,
         error: { message, suggestion },
@@ -126,10 +109,7 @@ function initOperationFailure(options) {
                     ? "生成物料化"
                     : "目标目录渲染";
     return {
-        schemaVersion: 1,
-        command: "init",
         status: "operation-failure",
-        code: "OPERATION_INIT_FAILED",
         phase: options.phase,
         targetDir: options.targetDir,
         error: {
@@ -139,18 +119,6 @@ function initOperationFailure(options) {
     };
 }
 export async function runInit(options, runtime) {
-    if (!options.dryRun &&
-        !options.yes &&
-        (options.json || !runtime.tty.stdin || !runtime.tty.stdout)) {
-        return {
-            schemaVersion: 1,
-            command: "init",
-            status: "usage-error",
-            code: "USAGE_INIT_INVALID",
-            targetDir: options.dir,
-            issues: [{ code: "NON_INTERACTIVE_CONFIRMATION_REQUIRED" }],
-        };
-    }
     const targetDir = path.resolve(runtime.cwd, options.dir);
     const overrides = (options.name ?? options.path ?? options.scope) === undefined
         ? undefined
@@ -166,10 +134,7 @@ export async function runInit(options, runtime) {
     });
     if (input.status === "input-invalid") {
         return {
-            schemaVersion: 1,
-            command: "init",
             status: "usage-error",
-            code: "USAGE_INIT_INVALID",
             targetDir: options.dir,
             issues: input.issues,
         };
@@ -181,10 +146,7 @@ export async function runInit(options, runtime) {
     });
     if (preparation.status === "input-invalid") {
         return {
-            schemaVersion: 1,
-            command: "init",
             status: "usage-error",
-            code: "USAGE_INIT_INVALID",
             targetDir: options.dir,
             issues: preparation.issues,
         };
@@ -227,8 +189,6 @@ export async function runInit(options, runtime) {
         });
     }
     const output = {
-        schemaVersion: 1,
-        command: "init",
         status: "success",
         dryRun: options.dryRun,
         targetDir: options.dir,
@@ -245,35 +205,6 @@ export async function runInit(options, runtime) {
     };
     if (options.dryRun)
         return output;
-    if (!options.yes &&
-        !(await runtime.confirmation.confirm({
-            message: [
-                "计划生成的项目",
-                "",
-                ...formatRows([
-                    ["预设", resolved.preset],
-                    ["名称", resolved.packages.map(({ name }) => name).join(", ")],
-                    [
-                        "路径",
-                        resolved.packages
-                            .map(({ path: packagePath }) => packagePath)
-                            .join(", "),
-                    ],
-                    ["Scope", resolved.scope],
-                    ["目标", options.dir],
-                    ["包数量", String(plan.blueprint.packages.length)],
-                ]),
-            ].join("\n"),
-            prompt: "生成这个项目？[y/N] ",
-        }))) {
-        return {
-            schemaVersion: 1,
-            command: "init",
-            status: "cancelled",
-            code: "CANCELLED",
-            targetDir: options.dir,
-        };
-    }
     try {
         await renderNewProject({
             targetRoot: path.resolve(runtime.cwd, options.dir),
@@ -295,10 +226,7 @@ export async function runAddPackage(options, runtime) {
     });
     if (preparation.status === "input-invalid") {
         return {
-            schemaVersion: 1,
-            command: "add package",
             status: "usage-error",
-            code: "USAGE_ADD_PACKAGE_INVALID",
             issues: preparation.issues,
         };
     }
@@ -307,8 +235,6 @@ export async function runAddPackage(options, runtime) {
     }
     if (preparation.status === "conflict") {
         return {
-            schemaVersion: 1,
-            command: "add package",
             status: "conflict",
             dryRun: options.dryRun,
             actions: [],
@@ -345,8 +271,6 @@ export async function runAddPackage(options, runtime) {
     }
     if (!reconciliation.ok) {
         return {
-            schemaVersion: 1,
-            command: "add package",
             status: "conflict",
             dryRun: options.dryRun,
             actions: [],
@@ -354,8 +278,6 @@ export async function runAddPackage(options, runtime) {
         };
     }
     return {
-        schemaVersion: 1,
-        command: "add package",
         status: "success",
         dryRun: options.dryRun,
         actions: reconciliation.actions,
@@ -363,10 +285,7 @@ export async function runAddPackage(options, runtime) {
 }
 function packageAdditionOperationFailure(phase, diagnostic) {
     return {
-        schemaVersion: 1,
-        command: "add package",
         status: "operation-failure",
-        code: "OPERATION_ADD_PACKAGE_FAILED",
         phase,
         error: diagnostic ?? {
             message: "添加 Package 时发生操作失败。",

package/dist/cli.js

@@ -1,43 +1,29 @@
 #!/usr/bin/env node
 import { createRequire } from "node:module";
 import path from "node:path";
-import { createInterface } from "node:readline/promises";
 import { fileURLToPath } from "node:url";
+import { nodeCliOutput } from "@ykdz/cli-contract/node";
 if (import.meta.url.endsWith(".ts")) {
     process.env.TEMPLATE_REPOSITORY_ROOT ??= path.resolve(path.dirname(fileURLToPath(import.meta.url)), "../../..");
 }
 const require = createRequire(import.meta.url);
-const packageManifest = require("../package.json");
 const runtime = {
     argv: process.argv,
-    streams: {
-        stdin: process.stdin,
-        stdout: process.stdout,
-        stderr: process.stderr,
+    // 把进程事实的读取留在 runCli 的故障出口内。
+    get commandName() {
+        const manifest = require("../package.json");
+        const names = Object.keys(manifest.bin);
+        if (names.length !== 1)
+            throw new Error("CLI 包必须声明唯一命令。");
+        return names[0];
     },
-    cwd: process.cwd(),
-    env: process.env,
-    tty: {
-        stdin: Boolean(process.stdin.isTTY),
-        stdout: Boolean(process.stdout.isTTY),
-        stderr: Boolean(process.stderr.isTTY),
+    write: nodeCliOutput({ stdout: process.stdout, stderr: process.stderr }),
+    get cwd() {
+        return process.cwd();
     },
-    version: packageManifest.version,
-    confirmation: {
-        async confirm(request) {
-            process.stdout.write(`${request.message}\n`);
-            const readline = createInterface({
-                input: process.stdin,
-                output: process.stdout,
-            });
-            try {
-                const answer = await readline.question(request.prompt);
-                return ["y", "yes"].includes(answer.trim().toLowerCase());
-            }
-            finally {
-                readline.close();
-            }
-        },
+    env: process.env,
+    get version() {
+        return require("../package.json").version;
     },
 };
 const { runCli } = await import("#main");

package/dist/input-schemas.d.ts

@@ -0,0 +1,30 @@
+export declare function initializationInputSchema(cwd: string): import("@valibot/to-json-schema").StandardJsonSchema<{
+    dir: string;
+    preset: string;
+    name?: string | undefined;
+    path?: string | undefined;
+    scope?: string | undefined;
+    dryRun?: boolean | undefined;
+    todo?: boolean | undefined;
+}, {
+    dir: string;
+    preset: string;
+    name?: string | undefined;
+    path?: string | undefined;
+    scope?: string | undefined;
+    dryRun: boolean;
+    todo: boolean;
+}>;
+export declare const packageAdditionInputSchema: import("@valibot/to-json-schema").StandardJsonSchema<{
+    preset: string;
+    name: string;
+    path?: string | undefined;
+    linkFrom?: string[] | undefined;
+    dryRun?: boolean | undefined;
+}, {
+    preset: string;
+    name: string;
+    path?: string | undefined;
+    linkFrom: string[];
+    dryRun: boolean;
+}>;

package/dist/input-schemas.js

@@ -0,0 +1,75 @@
+import path from "node:path";
+import { validateGeneratedRepositoryInitializationInput, validateGeneratedRepositoryPackageAdditionInput, } from "@ykdz/template-builtin-presets";
+import * as v from "valibot";
+import { listPresetCatalog } from "./application.js";
+import { standardSchema } from "./standard-schema.js";
+const initializationMessages = {
+    PRESET_UNKNOWN: "请选择有效的预设。",
+    FIXED_TOPOLOGY_OVERRIDE: "固定拓扑预设不支持覆盖初始包名称或路径。",
+    INVALID_PACKAGE_NAME: "--name 必须是有效的无 scope 包叶名称。",
+    INVALID_PACKAGE_PATH: "--path 必须恰好包含两个安全路径段。",
+    RESERVED_PACKAGE_PATH: "--path 不能使用保留的工作区目录。",
+    INVALID_PACKAGE_SCOPE: "--scope 必须是不含空白字符的有效 npm scope。",
+    INVALID_REPOSITORY_SCOPE: "目标目录名无法作为默认 scope，请指定 --scope。",
+    CONFLICTING_PACKAGE_IDENTITY: "初始包身份与基础配置包冲突。",
+};
+export function initializationInputSchema(cwd) {
+    return standardSchema(v.pipe(v.object({
+        dir: v.pipe(v.string(), v.nonEmpty()),
+        preset: v.picklist(listPresetCatalog().presets.map(({ name }) => name)),
+        name: v.optional(v.pipe(v.string(), v.description("无 scope 的 npm 包叶名称；仅可配置主包的预设允许覆盖。"))),
+        path: v.optional(v.pipe(v.string(), v.description("两个安全路径段；不能使用保留目录；仅可配置主包的预设允许覆盖。"))),
+        scope: v.optional(v.pipe(v.string(), v.description("有效 npm scope；省略时使用目标目录名。"))),
+        dryRun: v.optional(v.boolean(), false),
+        todo: v.optional(v.boolean(), true),
+    }), v.rawCheck(({ dataset, addIssue }) => {
+        if (!dataset.typed)
+            return;
+        const { dir, preset, name, path: packagePath, scope } = dataset.value;
+        const result = validateGeneratedRepositoryInitializationInput({
+            preset,
+            targetDir: path.resolve(cwd, dir),
+            overrides: {
+                ...(name === undefined ? {} : { name }),
+                ...(packagePath === undefined ? {} : { path: packagePath }),
+                ...(scope === undefined ? {} : { scope }),
+            },
+        });
+        if (result.status === "input-invalid") {
+            for (const issue of result.issues)
+                addIssue({ message: initializationMessages[issue.code] });
+        }
+    })), ["raw_check"]);
+}
+const additionMessages = {
+    PRESET_UNKNOWN: "请选择有效的预设。",
+    PRESET_NOT_ADDABLE: "该预设不支持新增包。",
+    INVALID_PACKAGE_NAME: "--name 必须是有效的无 scope 包叶名称。",
+    INVALID_PACKAGE_PATH: "--path 必须恰好包含两个安全路径段。",
+    RESERVED_PACKAGE_PATH: "--path 不能使用保留工作区目录。",
+    INVALID_LINK_FROM: "--link-from 必须恰好包含两个安全路径段。",
+    RESERVED_LINK_FROM: "--link-from 不能使用保留工作区目录。",
+    UNKNOWN_LINK_FROM: "指定的消费包不存在。",
+    UNSUPPORTED_LINK: "指定的包角色不支持此链接。",
+};
+export const packageAdditionInputSchema = standardSchema(v.pipe(v.object({
+    preset: v.picklist(listPresetCatalog().presets.map(({ name }) => name)),
+    name: v.pipe(v.string(), v.description("无 scope 的 npm 包叶名称。")),
+    path: v.optional(v.pipe(v.string(), v.description("两个安全路径段，不能使用保留工作区目录。"))),
+    linkFrom: v.optional(v.array(v.pipe(v.string(), v.description("消费包路径：两个安全路径段，不能使用保留工作区目录。"))), []),
+    dryRun: v.optional(v.boolean(), false),
+}), v.rawCheck(({ dataset, addIssue }) => {
+    if (!dataset.typed)
+        return;
+    const input = dataset.value;
+    const result = validateGeneratedRepositoryPackageAdditionInput({
+        preset: input.preset,
+        packageLeafName: input.name,
+        linkFrom: input.linkFrom,
+        ...(input.path === undefined ? {} : { packagePath: input.path }),
+    });
+    if (result.status === "input-invalid") {
+        for (const issue of result.issues)
+            addIssue({ message: additionMessages[issue.code] });
+    }
+})), ["raw_check"]);

package/dist/main.d.ts

@@ -1,20 +1,9 @@
-import { Command } from "commander";
+import { type WriteCliOutput } from "@ykdz/cli-contract";
 import { type ApplicationRuntime } from "./application.ts";
 export type CliRuntime = ApplicationRuntime & {
     readonly argv: readonly string[];
-    readonly streams: {
-        readonly stdin: object;
-        readonly stdout: {
-            write(chunk: string): unknown;
-        };
-        readonly stderr: {
-            write(chunk: string): unknown;
-        };
-    };
+    readonly write: WriteCliOutput;
+    readonly commandName: string;
     readonly version: string;
 };
-export declare function createCliCommand(runtime: CliRuntime, commanderOutput?: {
-    stdout: string;
-    stderr: string;
-}): Command;
 export declare function runCli(runtime: CliRuntime): Promise<number>;