i-repo 2.0.0 → 2.2.0

package/dist/commands/definitions/labels.js

@@ -4,6 +4,7 @@
 import { readFile } from "node:fs/promises";
 import { basename } from "node:path";
 import { handleError } from "../../core/errors.js";
+import { encodingOption, fileTypeXmlCsv } from "../shared-options.js";
 import { saveBinaryDownload, inferFilename } from "../../utils/file.js";
 import { formatOutput } from "../../ui/formatters/index.js";
 import { withSpinner } from "../../ui/spinner.js";
@@ -15,8 +16,8 @@ export function registerDefinitionsLabels(parent, getClient) {
     labels
         .command("download")
         .description("Download definition labels")
-        .requiredOption("--type <type>", "File type (xml/csv)")
-        .option("--encoding <encoding>", "Encoding (932=SJIS, 65001=UTF8)")
+        .addOption(fileTypeXmlCsv("--type <type>"))
+        .addOption(encodingOption())
         .option("-o, --output <path>", "Output file path")
         .action(async (options, cmd) => {
         try {
@@ -38,8 +39,8 @@ export function registerDefinitionsLabels(parent, getClient) {
     labels
         .command("upload <file>")
         .description("Upload definition labels")
-        .requiredOption("--type <type>", "File type (xml/csv)")
-        .option("--encoding <encoding>", "Encoding (932=SJIS, 65001=UTF8)")
+        .addOption(fileTypeXmlCsv("--type <type>"))
+        .addOption(encodingOption())
         .action(async (file, options, cmd) => {
         try {
             const globalOpts = cmd.optsWithGlobals();
@@ -68,8 +69,8 @@ export function registerDefinitionsLabels(parent, getClient) {
     reportLabels
         .command("download")
         .description("Download report label definitions")
-        .requiredOption("--type <type>", "File type (xml/csv)")
-        .option("--encoding <encoding>", "Encoding (932=SJIS, 65001=UTF8)")
+        .addOption(fileTypeXmlCsv("--type <type>"))
+        .addOption(encodingOption())
         .option("-o, --output <path>", "Output file path")
         .action(async (options, cmd) => {
         try {
@@ -91,8 +92,8 @@ export function registerDefinitionsLabels(parent, getClient) {
     reportLabels
         .command("upload <file>")
         .description("Upload report label definitions")
-        .requiredOption("--type <type>", "File type (xml/csv)")
-        .option("--encoding <encoding>", "Encoding (932=SJIS, 65001=UTF8)")
+        .addOption(fileTypeXmlCsv("--type <type>"))
+        .addOption(encodingOption())
         .action(async (file, options, cmd) => {
         try {
             const globalOpts = cmd.optsWithGlobals();
@@ -115,4 +116,3 @@ export function registerDefinitionsLabels(parent, getClient) {
         }
     });
 }
-//# sourceMappingURL=labels.js.map

package/dist/commands/definitions/list.d.ts

@@ -4,4 +4,3 @@
 import type { Command } from "commander";
 import type { IReporterClient } from "../../sdk/index.js";
 export declare function registerDefinitionsList(parent: Command, getClient: (cmd: Command) => Promise<IReporterClient>): void;
-//# sourceMappingURL=list.d.ts.map

package/dist/commands/definitions/list.js

@@ -2,15 +2,18 @@ import { PublicStatus } from "../../sdk/index.js";
 import { formatOutput } from "../../ui/formatters/index.js";
 import { typeLabels, currentLabels } from "../../ui/formatters/renderers.js";
 import { handleError } from "../../core/errors.js";
+import { choiceOption, collectSystemKeys, parseChoiceList, parseLabelId, } from "../shared-options.js";
 export function registerDefinitionsList(parent, getClient) {
     parent
         .command("list")
         .description("List definitions")
-        .option("-l, --label-id <id>", "Label ID (-9 for all levels)")
+        // タイポしたフィルタ値を黙って捨てると「フィルタなしの全件」が
+        // 成功の顔で返る — choices()/parser でパース時に弾く (help にも許容値が出る)
+        .option("-l, --label-id <id>", "Label ID (-9 for all levels)", parseLabelId)
         .option("-w, --word <keyword>", "Search keyword")
-        .option("--public-status <status>", "Public status (test/published)")
-        .option("-t, --type <types>", "Item types to include (label,sheet,set,book)")
-        .option("--word-target <targets>", "Search targets (name,remarks)", "name")
+        .addOption(choiceOption("--public-status <status>", "Public status", ["test", "published"]))
+        .option("-t, --type <types>", "Item types to include (comma-separated: label,sheet,set,book)", parseChoiceList(["label", "sheet", "set", "book"]))
+        .option("--word-target <targets>", "Search targets (comma-separated: name,remarks)", parseChoiceList(["name", "remarks"]), "name")
         .option("--history", "Include history definitions")
         .option("-k, --system-key <n>=<v>", "System key (1-5)", collectSystemKeys, {})
         .action(async (options, cmd) => {
@@ -46,12 +49,12 @@ function buildListParams(options) {
         params.word = options.word;
     if (options.history)
         params.history = true;
-    // Public status mapping
+    // Public status (choices() 検証済み)
     if (options.publicStatus === "test")
         params.publicStatus = PublicStatus.Test;
     else if (options.publicStatus === "published")
         params.publicStatus = PublicStatus.Published;
-    // Item type targets
+    // Item type targets (parseChoiceList 検証済み)
     if (options.type) {
         const types = options.type.split(",");
         params.itemTargetLabel = types.includes("label");
@@ -59,13 +62,13 @@ function buildListParams(options) {
         params.itemTargetSet = types.includes("set");
         params.itemTargetBook = types.includes("book");
     }
-    // Word targets
+    // Word targets (parseChoiceList 検証済み)
     if (options.wordTarget) {
         const targets = options.wordTarget.split(",");
         params.wordTargetName = targets.includes("name");
         params.wordTargetRemarks = targets.includes("remarks");
     }
-    // System keys
+    // System keys (collectSystemKeys 検証済み)
     const systemKeys = options.systemKey;
     if (systemKeys) {
         for (const [n, v] of Object.entries(systemKeys)) {
@@ -74,12 +77,3 @@ function buildListParams(options) {
     }
     return params;
 }
-// ── Helpers ────────────────────────────────────────────────────
-function collectSystemKeys(value, previous) {
-    const [n, v] = value.split("=", 2);
-    if (n && v && Number(n) >= 1 && Number(n) <= 5) {
-        previous[n] = v;
-    }
-    return previous;
-}
-//# sourceMappingURL=list.js.map

package/dist/commands/definitions/lock.d.ts

@@ -4,4 +4,3 @@
 import type { Command } from "commander";
 import type { IReporterClient } from "../../sdk/index.js";
 export declare function registerDefinitionsLock(parent: Command, getClient: (cmd: Command) => Promise<IReporterClient>): void;
-//# sourceMappingURL=lock.d.ts.map

package/dist/commands/definitions/lock.js

@@ -1,12 +1,14 @@
-import { handleError } from "../../core/errors.js";
+import { assertNumericId, handleError } from "../../core/errors.js";
 import { printSuccess } from "../../ui/index.js";
 import { withSpinner } from "../../ui/spinner.js";
 export function registerDefinitionsLock(parent, getClient) {
     parent
-        .command("lock <topId>")
+        .command("lock")
         .description("Acquire exclusive lock on a definition")
+        .argument("<topId>", "Definition TOPID (numeric)")
         .action(async (topId, _options, cmd) => {
         try {
+            assertNumericId(topId, "topId");
             const client = await getClient(cmd);
             await withSpinner("processing", async () => {
                 await client.definitions.lock({ topId });
@@ -18,10 +20,12 @@ export function registerDefinitionsLock(parent, getClient) {
         }
     });
     parent
-        .command("unlock <topId>")
+        .command("unlock")
         .description("Release exclusive lock on a definition")
+        .argument("<topId>", "Definition TOPID (numeric)")
         .action(async (topId, _options, cmd) => {
         try {
+            assertNumericId(topId, "topId");
             const client = await getClient(cmd);
             await withSpinner("processing", async () => {
                 await client.definitions.unlock({ topId });
@@ -33,4 +37,3 @@ export function registerDefinitionsLock(parent, getClient) {
         }
     });
 }
-//# sourceMappingURL=lock.js.map

package/dist/commands/definitions/roles.d.ts

@@ -1,4 +1,3 @@
 import type { Command } from "commander";
 import type { IReporterClient } from "../../sdk/index.js";
 export declare function registerDefinitionsRoles(parent: Command, getClient: (cmd: Command) => Promise<IReporterClient>): void;
-//# sourceMappingURL=roles.d.ts.map

package/dist/commands/definitions/roles.js

@@ -4,6 +4,7 @@
 import { readFile } from "node:fs/promises";
 import { basename } from "node:path";
 import { handleError } from "../../core/errors.js";
+import { choiceOption, encodingOption, fileTypeXmlCsv } from "../shared-options.js";
 import { saveBinaryDownload, inferFilename } from "../../utils/file.js";
 import { formatOutput } from "../../ui/formatters/index.js";
 import { withSpinner } from "../../ui/spinner.js";
@@ -14,8 +15,8 @@ export function registerDefinitionsRoles(parent, getClient) {
     roles
         .command("download")
         .description("Download definition roles")
-        .requiredOption("--type <type>", "File type (xml/csv)")
-        .option("--encoding <encoding>", "Encoding (932=SJIS, 65001=UTF8)")
+        .addOption(fileTypeXmlCsv("--type <type>"))
+        .addOption(encodingOption())
         .option("-o, --output <path>", "Output file path")
         .action(async (options, cmd) => {
         try {
@@ -37,10 +38,10 @@ export function registerDefinitionsRoles(parent, getClient) {
     roles
         .command("upload <file>")
         .description("Upload definition roles")
-        .requiredOption("--type <type>", "File type (xml/csv)")
-        .option("--encoding <encoding>", "Encoding (932=SJIS, 65001=UTF8)")
-        .option("--def-role-mode <mode>", "Apply to revision definitions (0/1)")
-        .option("--rep-role-mode <mode>", "Apply to input reports (0/1)")
+        .addOption(fileTypeXmlCsv("--type <type>"))
+        .addOption(encodingOption())
+        .addOption(choiceOption("--def-role-mode <mode>", "Apply to revision definitions", ["0", "1"]))
+        .addOption(choiceOption("--rep-role-mode <mode>", "Apply to input reports", ["0", "1"]))
         .action(async (file, options, cmd) => {
         try {
             const globalOpts = cmd.optsWithGlobals();
@@ -65,4 +66,3 @@ export function registerDefinitionsRoles(parent, getClient) {
         }
     });
 }
-//# sourceMappingURL=roles.js.map

package/dist/commands/index.d.ts

@@ -8,4 +8,3 @@ export { reportsCommand } from "./reports/index.js";
 export { reportBatchesCommand } from "./report-batches/index.js";
 export { definitionBatchesCommand } from "./definition-batches/index.js";
 export { systemsCommand } from "./systems/index.js";
-//# sourceMappingURL=index.d.ts.map

package/dist/commands/index.js

@@ -8,4 +8,3 @@ export { reportsCommand } from "./reports/index.js";
 export { reportBatchesCommand } from "./report-batches/index.js";
 export { definitionBatchesCommand } from "./definition-batches/index.js";
 export { systemsCommand } from "./systems/index.js";
-//# sourceMappingURL=index.js.map

package/dist/commands/plugin.d.ts

@@ -8,4 +8,3 @@
  */
 import { Command } from "commander";
 export declare const pluginCommand: Command;
-//# sourceMappingURL=plugin.d.ts.map

package/dist/commands/plugin.js

@@ -7,13 +7,15 @@
  * (verify).
  */
 import { Command } from "commander";
-import { chmodSync, existsSync, mkdirSync, writeFileSync } from "node:fs";
+import { chmodSync, existsSync, mkdirSync, mkdtempSync, rmSync, writeFileSync } from "node:fs";
+import { tmpdir } from "node:os";
 import { join } from "node:path";
 import { findPlugin, listPlugins, pluginHomeDir, isValidPluginName, PLUGIN_PREFIX, } from "../plugins/dispatch.js";
 import { shTemplate, nodeTemplate } from "../plugins/templates.js";
-import { verifyPlugin } from "../plugins/verify.js";
-import { formatOutput } from "../ui/index.js";
-import { handleError } from "../core/errors.js";
+import { verifyPlugin, runPlugin, parseLines } from "../plugins/verify.js";
+import { validateDescribe, buildDescribeRow } from "../plugins/describe.js";
+import { formatOutput, out } from "../ui/index.js";
+import { handleError, ValidationError } from "../core/errors.js";
 export const pluginCommand = new Command("plugin").description("Manage i-repo plugins (PATH-based i-repo-* executables)");
 pluginCommand
     .command("list")
@@ -39,13 +41,74 @@ pluginCommand
     .action((name) => {
     const p = findPlugin(name);
     if (p) {
-        console.log(p);
+        out(p);
     }
     else {
         console.error(`Plugin "i-repo-${name}" not found on PATH.`);
         process.exitCode = 1;
     }
 });
+pluginCommand
+    .command("describe")
+    .description("Show a plugin's self-description (--plugin-schema): contract versions, recordTypes, params")
+    .argument("<name>", "Plugin name (without the i-repo- prefix)")
+    .action((name, _options, cmd) => {
+    const globalOpts = cmd.optsWithGlobals();
+    try {
+        const bin = findPlugin(name);
+        if (!bin) {
+            handleError(new ValidationError(`Plugin "i-repo-${name}" not found on PATH.`), { format: globalOpts.format });
+            return;
+        }
+        // verify と同じ信頼境界で1回だけ問い合わせる (allow-list env / 一時cwd /
+        // timeout)。メタデータ照会に pluginPassEnv の秘密は不要 (passEnv:false)
+        const cwd = mkdtempSync(join(tmpdir(), "irepo-describe-"));
+        let probe;
+        try {
+            probe = runPlugin(bin, ["--plugin-schema"], { cwd, passEnv: false });
+        }
+        finally {
+            rmSync(cwd, { recursive: true, force: true });
+        }
+        if (probe.failed || probe.status !== 0) {
+            handleError(new ValidationError(`Plugin "i-repo-${name}" does not answer --plugin-schema (exit ${probe.status}). ` +
+                `Self-description is optional — see docs/PLUGINS.md §3.`), { format: globalOpts.format });
+            return;
+        }
+        const { rows, invalid } = parseLines(probe.stdout);
+        const declared = rows[0];
+        if (invalid.length > 0 || rows.length !== 1 || !Array.isArray(declared?.pluginApi)) {
+            handleError(new ValidationError(`Plugin "i-repo-${name}" answered --plugin-schema but not with a single JSON line containing pluginApi[].`), { format: globalOpts.format });
+            return;
+        }
+        // 壊れた宣言を黙って表示しない — これを信じるフォーム生成側を守る
+        const problems = validateDescribe(declared);
+        if (problems.length > 0) {
+            handleError(new ValidationError(`Plugin "i-repo-${name}" has a malformed self-description: ${problems[0]}`), { format: globalOpts.format });
+            return;
+        }
+        const format = (globalOpts.format ?? "table");
+        const row = buildDescribeRow(PLUGIN_PREFIX + name, bin, declared);
+        // 人間面 (table/csv) では params を読める1行に整形 (ndjson/json は宣言そのまま —
+        // render と同じ「ラベル化は人間面のみ」の流儀)
+        if ((format === "table" || format === "csv") && Array.isArray(row.params)) {
+            row.params = row.params
+                .map((p) => {
+                const choices = Array.isArray(p.choices) ? `:${p.choices.join("|")}` : "";
+                return `${String(p.name)} <${String(p.type)}${choices}>${p.required ? " (required)" : ""}`;
+            })
+                .join(", ");
+        }
+        formatOutput(row, {
+            format,
+            quiet: globalOpts.quiet,
+            quietField: "plugin",
+        });
+    }
+    catch (error) {
+        handleError(error, { format: globalOpts.format });
+    }
+});
 pluginCommand
     .command("init")
     .description("Scaffold a contract-conformant plugin in ~/.i-repo/plugins")
@@ -93,7 +156,7 @@ pluginCommand
     }
     for (const f of created)
         console.error(`✅ created ${f}`);
-    console.error(`   Try it:    i-repo ${name} --plugin-schema`);
+    console.error(`   Try it:    i-repo plugin describe ${name}`);
     console.error(`   Test it:   cat examples/fixtures/reports-list.ndjson | ${target}`);
     console.error(`   Check it:  i-repo plugin verify ${name}`);
 });
@@ -130,4 +193,3 @@ pluginCommand
         handleError(error, { format: globalOpts.format });
     }
 });
-//# sourceMappingURL=plugin.js.map

package/dist/commands/raw.d.ts

@@ -6,4 +6,3 @@
  */
 import { Command } from "commander";
 export declare const rawCommand: Command;
-//# sourceMappingURL=raw.d.ts.map

package/dist/commands/raw.js

@@ -8,8 +8,8 @@ import { Command } from "commander";
 import { readFile, writeFile } from "node:fs/promises";
 import { basename } from "node:path";
 import { createClient } from "../config/client.js";
-import { handleError } from "../core/errors.js";
-import { withSpinner } from "../ui/index.js";
+import { handleError, ValidationError } from "../core/errors.js";
+import { withSpinner, out } from "../ui/index.js";
 export const rawCommand = new Command("raw")
     .description("Execute raw API command (returns XML)")
     .argument("<params...>", "API parameters as key=value pairs (e.g. command=GetReportList labelId=-9)")
@@ -24,7 +24,8 @@ export const rawCommand = new Command("raw")
         for (const param of params) {
             const eqIdx = param.indexOf("=");
             if (eqIdx < 1) {
-                throw new Error(`Invalid parameter "${param}". Use key=value format (e.g. command=GetReportList)`);
+                // 引数形式の誤りは検証エラー (exit 11) — 素の Error だと exit 1 になる
+                throw new ValidationError(`Invalid parameter "${param}". Use key=value format (e.g. command=GetReportList)`);
             }
             parsedParams[param.substring(0, eqIdx)] = param.substring(eqIdx + 1);
         }
@@ -54,11 +55,10 @@ export const rawCommand = new Command("raw")
             }
         }
         else {
-            console.log(xml);
+            out(xml);
         }
     }
     catch (error) {
         handleError(error, { format: globalOpts.format });
     }
 });
-//# sourceMappingURL=raw.js.map

package/dist/commands/report-batches/index.d.ts

@@ -6,4 +6,3 @@
  */
 import { Command } from "commander";
 export declare const reportBatchesCommand: Command;
-//# sourceMappingURL=index.d.ts.map