@catladder/cli 0.0.0-new-cli-80ac360a → 0.0.0-new-cli-a65ec262

package/src/commands/security/commandSecurityAuditCiJob.ts

@@ -0,0 +1,91 @@
+import { defineCommand } from "../../core/defineCommand";
+import { Gitlab } from "@gitbeaker/rest";
+import {
+  evaluateSecurityAudit,
+  makeSecurityAuditOverview,
+} from "../../security/evaluateSecurityAudit";
+import {
+  createSecurityAuditMergeRequest,
+  SECURITY_AUDIT_FILE_NAME,
+} from "../../security/createSecurityAuditMergeRequest";
+
+const GITLAB_HOST = "https://git.panter.ch";
+
+export const commandSecurityAuditCiJob = defineCommand({
+  name: "security audit ci-job",
+  description:
+    "Evaluates security audit document. Creates MR with template if missing.",
+  group: "security",
+  inputs: {
+    path: { type: "string", message: "path to project root", positional: true },
+    token: {
+      type: "string",
+      message: "GitLab token (api scope)",
+      positional: true,
+    },
+    mainBranch: {
+      type: "string",
+      message: "main branch name",
+      positional: true,
+    },
+    projectId: {
+      type: "string",
+      message: "GitLab project ID",
+      positional: true,
+    },
+    userId: {
+      type: "string",
+      message: "GitLab user ID (assignee)",
+      positional: true,
+    },
+  },
+  execute: async (ctx) => {
+    const path = await ctx.get("path");
+    const evaluation = await evaluateSecurityAudit({ path });
+
+    if (evaluation.isErr()) {
+      ctx.log("could not evaluate security audit document");
+      ctx.log("creating new merge request with security audit template...");
+
+      const token = await ctx.get("token");
+      const mainBranch = await ctx.get("mainBranch");
+      const projectId = await ctx.get("projectId");
+      const userId = await ctx.get("userId");
+
+      const api = new Gitlab({ host: GITLAB_HOST, token });
+
+      const mr = await createSecurityAuditMergeRequest({
+        api,
+        mainBranch,
+        projectId,
+        userId: parseInt(userId),
+      });
+
+      if (mr.isErr()) {
+        ctx.log(
+          `could not create merge request with security audit template: ${mr.error}`,
+        );
+        process.exitCode = 1;
+        return;
+      }
+
+      ctx.log("security audit merge request created successfully");
+      ctx.log(
+        `please finish the MR by updating SECURITY.md document: ${mr.value.web_url}`,
+      );
+      process.exitCode = 1;
+      return;
+    }
+
+    if (evaluation.value.score.answeredTopics === 0) {
+      ctx.log("audit document has no answered topics");
+      ctx.log(
+        `please answer security topics in ${SECURITY_AUDIT_FILE_NAME} by adding responsible people and check/cross in the table`,
+      );
+      process.exitCode = 1;
+      return;
+    }
+
+    ctx.log(makeSecurityAuditOverview(evaluation.value));
+  },
+});

package/src/commands/security/commandSecurityAuditCreate.ts

@@ -0,0 +1,58 @@
+import { defineCommand } from "../../core/defineCommand";
+import { Gitlab } from "@gitbeaker/rest";
+import { createSecurityAuditMergeRequest } from "../../security/createSecurityAuditMergeRequest";
+
+const GITLAB_HOST = "https://git.panter.ch";
+
+export const commandSecurityAuditCreate = defineCommand({
+  name: "security audit create",
+  description: "Creates a MR with the latest security audit template document",
+  group: "security",
+  inputs: {
+    token: {
+      type: "string",
+      message: "GitLab token (api scope)",
+      positional: true,
+    },
+    mainBranch: {
+      type: "string",
+      message: "main branch name",
+      positional: true,
+    },
+    projectId: {
+      type: "string",
+      message: "GitLab project ID",
+      positional: true,
+    },
+    userId: {
+      type: "string",
+      message: "GitLab user ID (assignee)",
+      positional: true,
+    },
+  },
+  execute: async (ctx) => {
+    const token = await ctx.get("token");
+    const mainBranch = await ctx.get("mainBranch");
+    const projectId = await ctx.get("projectId");
+    const userId = await ctx.get("userId");
+
+    const api = new Gitlab({ host: GITLAB_HOST, token });
+
+    const result = await createSecurityAuditMergeRequest({
+      api,
+      mainBranch,
+      projectId,
+      userId: parseInt(userId),
+    });
+
+    if (result.isErr()) {
+      ctx.log(`could not create security audit merge request: ${result.error}`);
+      process.exitCode = 1;
+    } else {
+      ctx.log("security audit merge request created successfully");
+      ctx.log(
+        `please finish the MR by updating SECURITY.md document: ${result.value.web_url}`,
+      );
+    }
+  },
+});

package/src/commands/security/commandSecurityAuditEvaluate.ts

@@ -0,0 +1,30 @@
+import { defineCommand } from "../../core/defineCommand";
+import {
+  evaluateSecurityAudit,
+  makeSecurityAuditOverview,
+} from "../../security/evaluateSecurityAudit";
+import { SECURITY_AUDIT_FILE_NAME } from "../../security/createSecurityAuditMergeRequest";
+
+export const commandSecurityAuditEvaluate = defineCommand({
+  name: "security audit evaluate",
+  description: "Evaluates security audit document in given path",
+  group: "security",
+  inputs: {
+    path: { type: "string", message: "path to project root", positional: true },
+  },
+  execute: async (ctx) => {
+    const path = await ctx.get("path");
+    ctx.log("evaluating security audit document...");
+
+    const result = await evaluateSecurityAudit({ path });
+    if (result.isErr()) {
+      ctx.log(`${result.error}`);
+      ctx.log(
+        `please make sure the security audit document ${SECURITY_AUDIT_FILE_NAME} is in the repository`,
+      );
+      process.exitCode = 1;
+    } else {
+      ctx.log(makeSecurityAuditOverview(result.value));
+    }
+  },
+});

package/src/completion.ts

@@ -16,60 +16,68 @@ export async function getCompletions(
   words: string[],
   cursorWord: string,
 ): Promise<string[]> {
-  // If no command yet, complete command names
-  if (words.length === 0) {
-    return allCommands
-      .map((c) => c.name)
-      .filter((name) => name.startsWith(cursorWord));
-  }
-
-  const commandName = words[0];
-  const command = allCommands.find((c) => c.name === commandName);
+  // Try to match words against command names (which can be multi-word)
+  // Walk through words, consuming them as command name parts until we find
+  // an exact command match or need to suggest the next subcommand level.
+
+  // Find all commands whose name starts with the words typed so far
+  const typed = words.join(" ");
+
+  // Exact match: we've typed a full command name, now complete its inputs
+  const exactCommand = allCommands.find((c) => c.name === typed);
+  if (exactCommand) {
+    // Check if cursor is a --flag
+    if (cursorWord.startsWith("--")) {
+      return getFlagCompletions(exactCommand, cursorWord);
+    }
 
-  // If the first word doesn't match a command, complete command names
-  if (!command) {
-    return allCommands
-      .map((c) => c.name)
-      .filter((name) => name.startsWith(commandName));
-  }
+    // Check if previous word was a --flag (complete its value)
+    const prevWord = words[words.length - 1];
+    if (prevWord?.startsWith("--")) {
+      const flagName = prevWord.replace(/^--/, "");
+      const inputName = flagNameToInputName(flagName);
+      const inputDef = exactCommand.inputs[inputName];
+      if (inputDef && "choices" in inputDef && inputDef.choices) {
+        return resolveChoicesForCompletion(inputDef, cursorWord);
+      }
+      return [];
+    }
 
-  // We have a valid command. Figure out what to complete.
-  const argsAfterCommand = words.slice(1);
-
-  // Check if we're completing a --flag value
-  const prevWord = argsAfterCommand[argsAfterCommand.length - 1];
-  if (prevWord?.startsWith("--")) {
-    // Previous word is a flag, complete its values
-    const flagName = prevWord.replace(/^--/, "");
-    const inputName = flagNameToInputName(flagName);
-    const inputDef = command.inputs[inputName];
-    if (inputDef && "choices" in inputDef && inputDef.choices) {
-      return resolveChoicesForCompletion(inputDef, cursorWord);
+    // Complete positional inputs
+    const positionalInputs = getPositionalInputs(exactCommand);
+    // Count non-flag args after the command name
+    const argsAfterCommand = words.slice(exactCommand.name.split(" ").length);
+    const positionalArgs = argsAfterCommand.filter((w) => !w.startsWith("--"));
+    const positionalIndex = positionalArgs.length;
+    const targetInput = positionalInputs[positionalIndex];
+
+    if (targetInput) {
+      const [, inputDef] = targetInput;
+      if ("choices" in inputDef && inputDef.choices) {
+        return resolveChoicesForCompletion(inputDef, cursorWord);
+      }
     }
     return [];
   }
 
-  // Check if we're typing a --flag name
-  if (cursorWord.startsWith("--")) {
-    return getFlagCompletions(command, cursorWord);
-  }
-
-  // Otherwise, complete positional inputs
-  const positionalInputs = getPositionalInputs(command);
-  const positionalArgs = argsAfterCommand.filter((w) => !w.startsWith("--"));
-
-  // Which positional index are we on?
-  const positionalIndex = positionalArgs.length;
-  const targetInput = positionalInputs[positionalIndex];
-
-  if (targetInput) {
-    const [, inputDef] = targetInput;
-    if ("choices" in inputDef && inputDef.choices) {
-      return resolveChoicesForCompletion(inputDef, cursorWord);
+  // No exact match. Complete the next level of subcommand names.
+  // The prefix is what's been typed so far (words joined with space).
+  const prefix = typed ? typed + " " : "";
+
+  // Find unique next-level subcommand names
+  const nextParts = new Set<string>();
+  for (const cmd of allCommands) {
+    if (cmd.name.startsWith(prefix)) {
+      // Get the next word after the prefix
+      const rest = cmd.name.slice(prefix.length);
+      const nextPart = rest.split(" ")[0];
+      if (nextPart && nextPart.startsWith(cursorWord)) {
+        nextParts.add(nextPart);
+      }
     }
   }
 
-  return [];
+  return [...nextParts].sort();
 }
 
 function getPositionalInputs(command: CommandDef): [string, InputDef][] {

package/bin/catci

@@ -1,3 +0,0 @@
-#!/usr/bin/env node
-// tslint:disable-next-line:no-var-requires
-require("../dist/bundles/catci/index.js");

package/bin/catci-dev

@@ -1,3 +0,0 @@
-#!/usr/bin/env node
-// tslint:disable-next-line:no-var-requires
-require("../dist/cli/src/catci.js");