@flowscripter/dynamic-cli-framework 1.2.2 → 1.3.0

package/src/service/completion/CompletionServiceProvider.ts

@@ -10,10 +10,7 @@ import { PromptType } from "../../api/service/core/PrompterService.ts";
 import type PrompterService from "../../api/service/core/PrompterService.ts";
 import { KEY_VALUE_SERVICE_ID } from "../../api/service/core/KeyValueService.ts";
 import type KeyValueService from "../../api/service/core/KeyValueService.ts";
-import {
-  Icon,
-  PRINTER_SERVICE_ID,
-} from "../../api/service/core/PrinterService.ts";
+import { Icon, PRINTER_SERVICE_ID } from "../../api/service/core/PrinterService.ts";
 import type PrinterService from "../../api/service/core/PrinterService.ts";
 import getLogger from "../../util/logger.ts";
 
@@ -25,10 +22,7 @@ export default class CompletionServiceProvider implements ServiceProvider {
   readonly #completionService: DefaultCompletionService;
   #cliName = "";
 
-  public constructor(
-    servicePriority: number,
-    completionService: DefaultCompletionService,
-  ) {
+  public constructor(servicePriority: number, completionService: DefaultCompletionService) {
     this.servicePriority = servicePriority;
     this.#completionService = completionService;
   }
@@ -47,28 +41,20 @@ export default class CompletionServiceProvider implements ServiceProvider {
       return;
     }
     if (!context.doesServiceExist(KEY_VALUE_SERVICE_ID)) {
-      logger.debug(
-        () => "KeyValueService not available, skipping auto-prompt",
-      );
+      logger.debug(() => "KeyValueService not available, skipping auto-prompt");
       return;
     }
 
-    const keyValueService = context.getServiceById(
-      KEY_VALUE_SERVICE_ID,
-    ) as KeyValueService;
+    const keyValueService = context.getServiceById(KEY_VALUE_SERVICE_ID) as KeyValueService;
     if (await keyValueService.hasKey("completion-status")) {
       const status = await keyValueService.getKey("completion-status");
       if (status === "installed" || status === "declined") {
-        logger.debug(
-          () => `Completion status is '${status}', skipping auto-prompt`,
-        );
+        logger.debug(() => `Completion status is '${status}', skipping auto-prompt`);
         return;
       }
     }
 
-    const prompterService = context.getServiceById(
-      PROMPTER_SERVICE_ID,
-    ) as PrompterService;
+    const prompterService = context.getServiceById(PROMPTER_SERVICE_ID) as PrompterService;
     if (!prompterService.promptEnabled) {
       logger.debug(() => "Prompting is disabled, skipping auto-prompt");
       return;
@@ -76,9 +62,7 @@ export default class CompletionServiceProvider implements ServiceProvider {
 
     const detectedShells = await this.#detectAvailableShells();
     if (detectedShells.length === 0) {
-      logger.debug(
-        () => "No supported shells detected, skipping auto-prompt",
-      );
+      logger.debug(() => "No supported shells detected, skipping auto-prompt");
       return;
     }
 
@@ -134,14 +118,9 @@ export default class CompletionServiceProvider implements ServiceProvider {
       await this.#installCompletion(context, shellType);
       await keyValueService.setKey("completion-status", "installed");
     } catch (error) {
-      logger.error(
-        "Failed to install completion: %s",
-        (error as Error).message,
-      );
+      logger.error("Failed to install completion: %s", (error as Error).message);
       if (context.doesServiceExist(PRINTER_SERVICE_ID)) {
-        const printerService = context.getServiceById(
-          PRINTER_SERVICE_ID,
-        ) as PrinterService;
+        const printerService = context.getServiceById(PRINTER_SERVICE_ID) as PrinterService;
         await printerService.error(
           `Failed to install completion: ${(error as Error).message}`,
           Icon.FAILURE,
@@ -160,15 +139,9 @@ export default class CompletionServiceProvider implements ServiceProvider {
     return available;
   }
 
-  async #installCompletion(
-    context: Context,
-    shellType: ShellType,
-  ): Promise<void> {
+  async #installCompletion(context: Context, shellType: ShellType): Promise<void> {
     const configPath = this.#completionService.getDefaultConfigPath(shellType);
-    const bootstrapScript = this.#completionService.getBootstrapScript(
-      shellType,
-      this.#cliName,
-    );
+    const bootstrapScript = this.#completionService.getBootstrapScript(shellType, this.#cliName);
     const beginMarker = `# BEGIN ${this.#cliName} completion`;
     const endMarker = `# END ${this.#cliName} completion`;
     const block = `${beginMarker}\n${bootstrapScript}\n${endMarker}`;
@@ -184,25 +157,24 @@ export default class CompletionServiceProvider implements ServiceProvider {
     const beginIdx = existingContent.indexOf(beginMarker);
     const endIdx = existingContent.indexOf(endMarker);
     if (beginIdx !== -1 && endIdx !== -1) {
-      newContent = existingContent.substring(0, beginIdx) +
+      newContent =
+        existingContent.substring(0, beginIdx) +
         block +
         existingContent.substring(endIdx + endMarker.length);
     } else {
-      const separator = existingContent.length > 0 &&
-          !existingContent.endsWith("\n")
-        ? "\n\n"
-        : existingContent.length > 0
-        ? "\n"
-        : "";
+      const separator =
+        existingContent.length > 0 && !existingContent.endsWith("\n")
+          ? "\n\n"
+          : existingContent.length > 0
+            ? "\n"
+            : "";
       newContent = existingContent + separator + block + "\n";
     }
 
     await Bun.write(configPath, newContent);
 
     if (context.doesServiceExist(PRINTER_SERVICE_ID)) {
-      const printerService = context.getServiceById(
-        PRINTER_SERVICE_ID,
-      ) as PrinterService;
+      const printerService = context.getServiceById(PRINTER_SERVICE_ID) as PrinterService;
       await printerService.info(
         `Shell completion installed for ${shellType}. Restart your shell or run 'source ${configPath}' to activate.`,
         Icon.SUCCESS,

package/src/service/completion/DefaultCompletionService.ts

@@ -1,8 +1,5 @@
 import type CompletionService from "../../api/service/core/CompletionService.ts";
-import {
-  type CompletionItem,
-  ShellType,
-} from "../../api/service/core/CompletionService.ts";
+import { type CompletionItem, ShellType } from "../../api/service/core/CompletionService.ts";
 import type CommandRegistry from "../../runtime/registry/CommandRegistry.ts";
 import type ShellHandler from "./shell/ShellHandler.ts";
 import BashShellHandler from "./shell/bash.ts";
@@ -38,10 +35,7 @@ export default class DefaultCompletionService implements CompletionService {
     return this.#getHandler(shellType).validateEnvironment();
   }
 
-  formatCompletions(
-    shellType: ShellType,
-    completions: ReadonlyArray<CompletionItem>,
-  ): string {
+  formatCompletions(shellType: ShellType, completions: ReadonlyArray<CompletionItem>): string {
     return this.#getHandler(shellType).formatCompletions(completions);
   }
 
@@ -70,28 +64,19 @@ export default class DefaultCompletionService implements CompletionService {
     const previousWords = relevantWords.slice(0, -1);
     const endsWithSpace = beforeCursor.endsWith(" ");
 
-    if (
-      relevantWords.length === 0 ||
-      (relevantWords.length === 1 && !endsWithSpace)
-    ) {
+    if (relevantWords.length === 0 || (relevantWords.length === 1 && !endsWithSpace)) {
       return Promise.resolve(this.#completeCommandName(currentWord));
     }
 
     if (endsWithSpace) {
       const commandWord = relevantWords[0]!;
-      return Promise.resolve(
-        this.#completeAfterCommand(commandWord, relevantWords.slice(1), ""),
-      );
+      return Promise.resolve(this.#completeAfterCommand(commandWord, relevantWords.slice(1), ""));
     }
 
     const commandWord = previousWords[0];
     if (commandWord) {
       return Promise.resolve(
-        this.#completeAfterCommand(
-          commandWord,
-          previousWords.slice(1),
-          currentWord,
-        ),
+        this.#completeAfterCommand(commandWord, previousWords.slice(1), currentWord),
       );
     }
 
@@ -105,14 +90,10 @@ export default class DefaultCompletionService implements CompletionService {
   ): ReadonlyArray<CompletionItem> {
     // Check for group:member pattern
     if (commandWord.includes(":")) {
-      const result = this.#commandRegistry!
-        .getGroupCommandAndMemberSubCommandByJoinedName(commandWord);
+      const result =
+        this.#commandRegistry!.getGroupCommandAndMemberSubCommandByJoinedName(commandWord);
       if (result) {
-        return this.#completeSubCommandArgs(
-          result.command,
-          intermediateWords,
-          currentWord,
-        );
+        return this.#completeSubCommandArgs(result.command, intermediateWords, currentWord);
       }
     }
 
@@ -120,9 +101,7 @@ export default class DefaultCompletionService implements CompletionService {
     if (currentWord.includes(":")) {
       const colonIdx = currentWord.indexOf(":");
       const groupPart = currentWord.substring(0, colonIdx);
-      const groupCommand = this.#commandRegistry!.getGroupCommandByName(
-        groupPart,
-      );
+      const groupCommand = this.#commandRegistry!.getGroupCommandByName(groupPart);
       if (groupCommand) {
         return groupCommand.memberSubCommands
           .filter((sc) => `${groupPart}:${sc.name}`.startsWith(currentWord))
@@ -136,17 +115,11 @@ export default class DefaultCompletionService implements CompletionService {
     // Check sub-command
     const subCommand = this.#commandRegistry!.getSubCommandByName(commandWord);
     if (subCommand) {
-      return this.#completeSubCommandArgs(
-        subCommand,
-        intermediateWords,
-        currentWord,
-      );
+      return this.#completeSubCommandArgs(subCommand, intermediateWords, currentWord);
     }
 
     // Check group command (suggest members)
-    const groupCommand = this.#commandRegistry!.getGroupCommandByName(
-      commandWord,
-    );
+    const groupCommand = this.#commandRegistry!.getGroupCommandByName(commandWord);
     if (groupCommand) {
       return groupCommand.memberSubCommands
         .filter((sc) => sc.name.startsWith(currentWord))
@@ -171,8 +144,7 @@ export default class DefaultCompletionService implements CompletionService {
     }
 
     // Group:member joined names
-    const groupAndMembers = this.#commandRegistry!
-      .getGroupAndMemberCommandsByJoinedName();
+    const groupAndMembers = this.#commandRegistry!.getGroupAndMemberCommandsByJoinedName();
     for (const [joinedName, entry] of groupAndMembers) {
       if (joinedName.startsWith(prefix)) {
         completions.push({
@@ -203,8 +175,7 @@ export default class DefaultCompletionService implements CompletionService {
     }
 
     // Global modifier commands (with -- prefix)
-    const modifierCommands = this.#commandRegistry!
-      .getGlobalModifierCommands();
+    const modifierCommands = this.#commandRegistry!.getGlobalModifierCommands();
     for (const cmd of modifierCommands) {
       const prefixed = `--${cmd.name}`;
       if (prefixed.startsWith(prefix)) {
@@ -270,9 +241,7 @@ export default class DefaultCompletionService implements CompletionService {
     for (const opt of subCommand.options) {
       if ("name" in opt) {
         const optName = `--${(opt as Option).name}`;
-        if (
-          !previousArgs.includes(optName) && optName.startsWith(currentWord)
-        ) {
+        if (!previousArgs.includes(optName) && optName.startsWith(currentWord)) {
           completions.push({
             value: optName,
             description: (opt as Option).description,
@@ -282,10 +251,7 @@ export default class DefaultCompletionService implements CompletionService {
     }
 
     // Suggest positional allowable values
-    const positionalIndex = this.#countPositionalArgs(
-      previousArgs,
-      subCommand,
-    );
+    const positionalIndex = this.#countPositionalArgs(previousArgs, subCommand);
     if (positionalIndex < subCommand.positionals.length) {
       const positional = subCommand.positionals[positionalIndex]!;
       if (positional.allowableValues) {
@@ -300,10 +266,7 @@ export default class DefaultCompletionService implements CompletionService {
     return completions;
   }
 
-  #countPositionalArgs(
-    args: ReadonlyArray<string>,
-    subCommand: SubCommand,
-  ): number {
+  #countPositionalArgs(args: ReadonlyArray<string>, subCommand: SubCommand): number {
     let count = 0;
     let i = 0;
     while (i < args.length) {
@@ -312,9 +275,7 @@ export default class DefaultCompletionService implements CompletionService {
         // Skip option and its value
         const optName = arg.startsWith("--") ? arg.substring(2) : undefined;
         const option = optName
-          ? subCommand.options.find(
-            (o) => "name" in o && (o as Option).name === optName,
-          )
+          ? subCommand.options.find((o) => "name" in o && (o as Option).name === optName)
           : undefined;
         if (option && option.type !== undefined) {
           i++; // skip the option value

package/src/service/completion/shell/ShellHandler.ts

@@ -10,7 +10,5 @@ export default interface ShellHandler {
   getBootstrapScript(cliName: string): string;
   validateEnvironment(): Promise<boolean>;
   formatCompletions(completions: ReadonlyArray<CompletionItem>): string;
-  parseCompletionContext(
-    args: ReadonlyArray<string>,
-  ): CompletionContext;
+  parseCompletionContext(args: ReadonlyArray<string>): CompletionContext;
 }

package/src/service/completion/shell/fish.ts

@@ -31,7 +31,7 @@ export default class FishShellHandler implements ShellHandler {
 
   formatCompletions(completions: ReadonlyArray<CompletionItem>): string {
     return completions
-      .map((c) => c.description ? `${c.value}\t${c.description}` : c.value)
+      .map((c) => (c.description ? `${c.value}\t${c.description}` : c.value))
       .join("\n");
   }
 

package/src/service/completion/shell/powershell.ts

@@ -10,19 +10,9 @@ import type { CompletionContext } from "./ShellHandler.ts";
 export default class PowerShellShellHandler implements ShellHandler {
   getDefaultConfigPath(): string {
     if (process.platform === "win32") {
-      return join(
-        homedir(),
-        "Documents",
-        "PowerShell",
-        "Microsoft.PowerShell_profile.ps1",
-      );
+      return join(homedir(), "Documents", "PowerShell", "Microsoft.PowerShell_profile.ps1");
     }
-    return join(
-      homedir(),
-      ".config",
-      "powershell",
-      "Microsoft.PowerShell_profile.ps1",
-    );
+    return join(homedir(), ".config", "powershell", "Microsoft.PowerShell_profile.ps1");
   }
 
   getBootstrapScript(cliName: string): string {

package/src/service/completion/shell/zsh.ts

@@ -38,7 +38,7 @@ export default class ZshShellHandler implements ShellHandler {
 
   formatCompletions(completions: ReadonlyArray<CompletionItem>): string {
     return completions
-      .map((c) => c.description ? `${c.value}:${c.description}` : c.value)
+      .map((c) => (c.description ? `${c.value}:${c.description}` : c.value))
       .join("\n");
   }