@flowscripter/dynamic-cli-framework 1.2.1 → 1.3.0

package/tests/service/completion/CompletionServiceProvider.test.ts

@@ -46,14 +46,11 @@ describe("CompletionServiceProvider", () => {
     await provider.getServiceInfo(getCLIConfig());
 
     const context = new DefaultContext(getCLIConfig());
-    context.addServiceInstance(
-      "@flowscripter/dynamic-cli-framework/prompter-service",
-      {
-        promptEnabled: true,
-        prompt: () => Promise.resolve({ name: "", value: false }),
-        promptAll: () => Promise.resolve([]),
-      },
-    );
+    context.addServiceInstance("@flowscripter/dynamic-cli-framework/prompter-service", {
+      promptEnabled: true,
+      prompt: () => Promise.resolve({ name: "", value: false }),
+      promptAll: () => Promise.resolve([]),
+    });
     await expect(provider.initService(context)).resolves.toBeUndefined();
   });
 
@@ -63,23 +60,17 @@ describe("CompletionServiceProvider", () => {
     await provider.getServiceInfo(getCLIConfig());
 
     const context = new DefaultContext(getCLIConfig());
-    context.addServiceInstance(
-      "@flowscripter/dynamic-cli-framework/prompter-service",
-      {
-        promptEnabled: true,
-        prompt: () => Promise.resolve({ name: "", value: false }),
-        promptAll: () => Promise.resolve([]),
-      },
-    );
-    context.addServiceInstance(
-      "@flowscripter/dynamic-cli-framework/key-value-service",
-      {
-        hasKey: (key: string) => Promise.resolve(key === "completion-status"),
-        getKey: () => Promise.resolve("installed"),
-        setKey: () => Promise.resolve(),
-        deleteKey: () => Promise.resolve(),
-      },
-    );
+    context.addServiceInstance("@flowscripter/dynamic-cli-framework/prompter-service", {
+      promptEnabled: true,
+      prompt: () => Promise.resolve({ name: "", value: false }),
+      promptAll: () => Promise.resolve([]),
+    });
+    context.addServiceInstance("@flowscripter/dynamic-cli-framework/key-value-service", {
+      hasKey: (key: string) => Promise.resolve(key === "completion-status"),
+      getKey: () => Promise.resolve("installed"),
+      setKey: () => Promise.resolve(),
+      deleteKey: () => Promise.resolve(),
+    });
     await expect(provider.initService(context)).resolves.toBeUndefined();
   });
 
@@ -89,23 +80,17 @@ describe("CompletionServiceProvider", () => {
     await provider.getServiceInfo(getCLIConfig());
 
     const context = new DefaultContext(getCLIConfig());
-    context.addServiceInstance(
-      "@flowscripter/dynamic-cli-framework/prompter-service",
-      {
-        promptEnabled: true,
-        prompt: () => Promise.resolve({ name: "", value: false }),
-        promptAll: () => Promise.resolve([]),
-      },
-    );
-    context.addServiceInstance(
-      "@flowscripter/dynamic-cli-framework/key-value-service",
-      {
-        hasKey: (key: string) => Promise.resolve(key === "completion-status"),
-        getKey: () => Promise.resolve("declined"),
-        setKey: () => Promise.resolve(),
-        deleteKey: () => Promise.resolve(),
-      },
-    );
+    context.addServiceInstance("@flowscripter/dynamic-cli-framework/prompter-service", {
+      promptEnabled: true,
+      prompt: () => Promise.resolve({ name: "", value: false }),
+      promptAll: () => Promise.resolve([]),
+    });
+    context.addServiceInstance("@flowscripter/dynamic-cli-framework/key-value-service", {
+      hasKey: (key: string) => Promise.resolve(key === "completion-status"),
+      getKey: () => Promise.resolve("declined"),
+      setKey: () => Promise.resolve(),
+      deleteKey: () => Promise.resolve(),
+    });
     await expect(provider.initService(context)).resolves.toBeUndefined();
   });
 
@@ -115,23 +100,17 @@ describe("CompletionServiceProvider", () => {
     await provider.getServiceInfo(getCLIConfig());
 
     const context = new DefaultContext(getCLIConfig());
-    context.addServiceInstance(
-      "@flowscripter/dynamic-cli-framework/prompter-service",
-      {
-        promptEnabled: false,
-        prompt: () => Promise.resolve({ name: "", value: false }),
-        promptAll: () => Promise.resolve([]),
-      },
-    );
-    context.addServiceInstance(
-      "@flowscripter/dynamic-cli-framework/key-value-service",
-      {
-        hasKey: () => Promise.resolve(false),
-        getKey: () => Promise.resolve(""),
-        setKey: () => Promise.resolve(),
-        deleteKey: () => Promise.resolve(),
-      },
-    );
+    context.addServiceInstance("@flowscripter/dynamic-cli-framework/prompter-service", {
+      promptEnabled: false,
+      prompt: () => Promise.resolve({ name: "", value: false }),
+      promptAll: () => Promise.resolve([]),
+    });
+    context.addServiceInstance("@flowscripter/dynamic-cli-framework/key-value-service", {
+      hasKey: () => Promise.resolve(false),
+      getKey: () => Promise.resolve(""),
+      setKey: () => Promise.resolve(),
+      deleteKey: () => Promise.resolve(),
+    });
     await expect(provider.initService(context)).resolves.toBeUndefined();
   });
 
@@ -144,26 +123,20 @@ describe("CompletionServiceProvider", () => {
     const context = new DefaultContext(getCLIConfig());
 
     let promptCalled = false;
-    context.addServiceInstance(
-      "@flowscripter/dynamic-cli-framework/prompter-service",
-      {
-        promptEnabled: true,
-        prompt: () => {
-          promptCalled = true;
-          return Promise.resolve({ name: "", value: false });
-        },
-        promptAll: () => Promise.resolve([]),
+    context.addServiceInstance("@flowscripter/dynamic-cli-framework/prompter-service", {
+      promptEnabled: true,
+      prompt: () => {
+        promptCalled = true;
+        return Promise.resolve({ name: "", value: false });
       },
-    );
-    context.addServiceInstance(
-      "@flowscripter/dynamic-cli-framework/key-value-service",
-      {
-        hasKey: () => Promise.resolve(false),
-        getKey: () => Promise.resolve(""),
-        setKey: () => Promise.resolve(),
-        deleteKey: () => Promise.resolve(),
-      },
-    );
+      promptAll: () => Promise.resolve([]),
+    });
+    context.addServiceInstance("@flowscripter/dynamic-cli-framework/key-value-service", {
+      hasKey: () => Promise.resolve(false),
+      getKey: () => Promise.resolve(""),
+      setKey: () => Promise.resolve(),
+      deleteKey: () => Promise.resolve(),
+    });
 
     await provider.initService(context);
     expect(promptCalled).toBe(false);
@@ -179,28 +152,21 @@ describe("CompletionServiceProvider", () => {
 
     let storedKey = "";
     let storedValue = "";
-    context.addServiceInstance(
-      "@flowscripter/dynamic-cli-framework/prompter-service",
-      {
-        promptEnabled: true,
-        prompt: () =>
-          Promise.resolve({ name: "enable-completion", value: false }),
-        promptAll: () => Promise.resolve([]),
-      },
-    );
-    context.addServiceInstance(
-      "@flowscripter/dynamic-cli-framework/key-value-service",
-      {
-        hasKey: () => Promise.resolve(false),
-        getKey: () => Promise.resolve(""),
-        setKey: (key: string, value: string) => {
-          storedKey = key;
-          storedValue = value;
-          return Promise.resolve();
-        },
-        deleteKey: () => Promise.resolve(),
+    context.addServiceInstance("@flowscripter/dynamic-cli-framework/prompter-service", {
+      promptEnabled: true,
+      prompt: () => Promise.resolve({ name: "enable-completion", value: false }),
+      promptAll: () => Promise.resolve([]),
+    });
+    context.addServiceInstance("@flowscripter/dynamic-cli-framework/key-value-service", {
+      hasKey: () => Promise.resolve(false),
+      getKey: () => Promise.resolve(""),
+      setKey: (key: string, value: string) => {
+        storedKey = key;
+        storedValue = value;
+        return Promise.resolve();
       },
-    );
+      deleteKey: () => Promise.resolve(),
+    });
 
     await provider.initService(context);
     expect(storedKey).toEqual("completion-status");
@@ -209,8 +175,7 @@ describe("CompletionServiceProvider", () => {
 
   test("initService skips shell prompt when only one shell detected", async () => {
     const service = new DefaultCompletionService();
-    service.validateShellEnvironment = (shell) =>
-      Promise.resolve(shell === "bash");
+    service.validateShellEnvironment = (shell) => Promise.resolve(shell === "bash");
     const provider = new CompletionServiceProvider(60, service);
     await provider.getServiceInfo(getCLIConfig());
 
@@ -219,53 +184,42 @@ describe("CompletionServiceProvider", () => {
     const storedEntries: Array<{ key: string; value: string }> = [];
     const promptNames: string[] = [];
 
-    context.addServiceInstance(
-      "@flowscripter/dynamic-cli-framework/prompter-service",
-      {
-        promptEnabled: true,
-        prompt: (promptDef: { name: string }) => {
-          promptNames.push(promptDef.name);
-          return Promise.resolve({
-            name: promptDef.name,
-            value: true,
-          });
-        },
-        promptAll: () => Promise.resolve([]),
+    context.addServiceInstance("@flowscripter/dynamic-cli-framework/prompter-service", {
+      promptEnabled: true,
+      prompt: (promptDef: { name: string }) => {
+        promptNames.push(promptDef.name);
+        return Promise.resolve({
+          name: promptDef.name,
+          value: true,
+        });
       },
-    );
-    context.addServiceInstance(
-      "@flowscripter/dynamic-cli-framework/key-value-service",
-      {
-        hasKey: () => Promise.resolve(false),
-        getKey: () => Promise.resolve(""),
-        setKey: (key: string, value: string) => {
-          storedEntries.push({ key, value });
-          return Promise.resolve();
-        },
-        deleteKey: () => Promise.resolve(),
+      promptAll: () => Promise.resolve([]),
+    });
+    context.addServiceInstance("@flowscripter/dynamic-cli-framework/key-value-service", {
+      hasKey: () => Promise.resolve(false),
+      getKey: () => Promise.resolve(""),
+      setKey: (key: string, value: string) => {
+        storedEntries.push({ key, value });
+        return Promise.resolve();
       },
-    );
+      deleteKey: () => Promise.resolve(),
+    });
 
     let infoMessage = "";
-    context.addServiceInstance(
-      "@flowscripter/dynamic-cli-framework/printer-service",
-      {
-        info: (msg: string) => {
-          infoMessage = msg;
-          return Promise.resolve();
-        },
-        warn: () => Promise.resolve(),
-        error: () => Promise.resolve(),
-        print: () => Promise.resolve(),
+    context.addServiceInstance("@flowscripter/dynamic-cli-framework/printer-service", {
+      info: (msg: string) => {
+        infoMessage = msg;
+        return Promise.resolve();
       },
-    );
+      warn: () => Promise.resolve(),
+      error: () => Promise.resolve(),
+      print: () => Promise.resolve(),
+    });
 
     await provider.initService(context);
 
     expect(promptNames).toEqual(["enable-completion"]);
-    const statusEntry = storedEntries.find(
-      (e) => e.key === "completion-status",
-    );
+    const statusEntry = storedEntries.find((e) => e.key === "completion-status");
     expect(statusEntry).toBeDefined();
     expect(statusEntry!.value).toEqual("installed");
     expect(infoMessage).toContain("Shell completion installed for bash");
@@ -286,51 +240,39 @@ describe("CompletionServiceProvider", () => {
     promptResponses.set("shell-type", "zsh");
 
     let shellPromptDefault: unknown;
-    context.addServiceInstance(
-      "@flowscripter/dynamic-cli-framework/prompter-service",
-      {
-        promptEnabled: true,
-        prompt: (promptDef: {
-          name: string;
-          defaultOption?: { returnedValue: unknown };
-        }) => {
-          if (promptDef.name === "shell-type") {
-            shellPromptDefault = promptDef.defaultOption;
-          }
-          return Promise.resolve({
-            name: promptDef.name,
-            value: promptResponses.get(promptDef.name),
-          });
-        },
-        promptAll: () => Promise.resolve([]),
+    context.addServiceInstance("@flowscripter/dynamic-cli-framework/prompter-service", {
+      promptEnabled: true,
+      prompt: (promptDef: { name: string; defaultOption?: { returnedValue: unknown } }) => {
+        if (promptDef.name === "shell-type") {
+          shellPromptDefault = promptDef.defaultOption;
+        }
+        return Promise.resolve({
+          name: promptDef.name,
+          value: promptResponses.get(promptDef.name),
+        });
       },
-    );
-    context.addServiceInstance(
-      "@flowscripter/dynamic-cli-framework/key-value-service",
-      {
-        hasKey: () => Promise.resolve(false),
-        getKey: () => Promise.resolve(""),
-        setKey: (key: string, value: string) => {
-          storedEntries.push({ key, value });
-          return Promise.resolve();
-        },
-        deleteKey: () => Promise.resolve(),
+      promptAll: () => Promise.resolve([]),
+    });
+    context.addServiceInstance("@flowscripter/dynamic-cli-framework/key-value-service", {
+      hasKey: () => Promise.resolve(false),
+      getKey: () => Promise.resolve(""),
+      setKey: (key: string, value: string) => {
+        storedEntries.push({ key, value });
+        return Promise.resolve();
       },
-    );
+      deleteKey: () => Promise.resolve(),
+    });
 
     let infoMessage = "";
-    context.addServiceInstance(
-      "@flowscripter/dynamic-cli-framework/printer-service",
-      {
-        info: (msg: string) => {
-          infoMessage = msg;
-          return Promise.resolve();
-        },
-        warn: () => Promise.resolve(),
-        error: () => Promise.resolve(),
-        print: () => Promise.resolve(),
+    context.addServiceInstance("@flowscripter/dynamic-cli-framework/printer-service", {
+      info: (msg: string) => {
+        infoMessage = msg;
+        return Promise.resolve();
       },
-    );
+      warn: () => Promise.resolve(),
+      error: () => Promise.resolve(),
+      print: () => Promise.resolve(),
+    });
 
     await provider.initService(context);
 
@@ -338,9 +280,7 @@ describe("CompletionServiceProvider", () => {
       displayValue: "bash",
       returnedValue: "bash",
     });
-    const statusEntry = storedEntries.find(
-      (e) => e.key === "completion-status",
-    );
+    const statusEntry = storedEntries.find((e) => e.key === "completion-status");
     expect(statusEntry).toBeDefined();
     expect(statusEntry!.value).toEqual("installed");
     expect(infoMessage).toContain("Shell completion installed for zsh");
@@ -359,41 +299,32 @@ describe("CompletionServiceProvider", () => {
 
     const context = new DefaultContext(getCLIConfig());
 
-    context.addServiceInstance(
-      "@flowscripter/dynamic-cli-framework/prompter-service",
-      {
-        promptEnabled: true,
-        prompt: (promptDef: { name: string }) =>
-          Promise.resolve({
-            name: promptDef.name,
-            value: promptDef.name === "enable-completion" ? true : "bash",
-          }),
-        promptAll: () => Promise.resolve([]),
-      },
-    );
-    context.addServiceInstance(
-      "@flowscripter/dynamic-cli-framework/key-value-service",
-      {
-        hasKey: () => Promise.resolve(false),
-        getKey: () => Promise.resolve(""),
-        setKey: () => Promise.resolve(),
-        deleteKey: () => Promise.resolve(),
-      },
-    );
+    context.addServiceInstance("@flowscripter/dynamic-cli-framework/prompter-service", {
+      promptEnabled: true,
+      prompt: (promptDef: { name: string }) =>
+        Promise.resolve({
+          name: promptDef.name,
+          value: promptDef.name === "enable-completion" ? true : "bash",
+        }),
+      promptAll: () => Promise.resolve([]),
+    });
+    context.addServiceInstance("@flowscripter/dynamic-cli-framework/key-value-service", {
+      hasKey: () => Promise.resolve(false),
+      getKey: () => Promise.resolve(""),
+      setKey: () => Promise.resolve(),
+      deleteKey: () => Promise.resolve(),
+    });
 
     let errorMessage = "";
-    context.addServiceInstance(
-      "@flowscripter/dynamic-cli-framework/printer-service",
-      {
-        info: () => Promise.resolve(),
-        warn: () => Promise.resolve(),
-        error: (msg: string) => {
-          errorMessage = msg;
-          return Promise.resolve();
-        },
-        print: () => Promise.resolve(),
+    context.addServiceInstance("@flowscripter/dynamic-cli-framework/printer-service", {
+      info: () => Promise.resolve(),
+      warn: () => Promise.resolve(),
+      error: (msg: string) => {
+        errorMessage = msg;
+        return Promise.resolve();
       },
-    );
+      print: () => Promise.resolve(),
+    });
 
     await provider.initService(context);
     expect(errorMessage).toContain("Failed to install completion");

package/tests/service/completion/DefaultCompletionService.test.ts

@@ -26,11 +26,7 @@ function makeSubCommand(
   };
 }
 
-function makeGroupCommand(
-  name: string,
-  description: string,
-  members: SubCommand[],
-): GroupCommand {
+function makeGroupCommand(name: string, description: string, members: SubCommand[]): GroupCommand {
   return {
     name,
     description,
@@ -40,10 +36,7 @@ function makeGroupCommand(
   };
 }
 
-function makeGlobalCommand(
-  name: string,
-  description: string,
-): GlobalCommand {
+function makeGlobalCommand(name: string, description: string): GlobalCommand {
   return {
     name,
     description,
@@ -53,10 +46,7 @@ function makeGlobalCommand(
   };
 }
 
-function makeGlobalModifierCommand(
-  name: string,
-  description: string,
-): GlobalModifierCommand {
+function makeGlobalModifierCommand(name: string, description: string): GlobalModifierCommand {
   return {
     name,
     description,
@@ -69,9 +59,7 @@ function makeGlobalModifierCommand(
 
 describe("DefaultCompletionService", () => {
   function createService(
-    commands: Array<
-      SubCommand | GroupCommand | GlobalCommand | GlobalModifierCommand
-    >,
+    commands: Array<SubCommand | GroupCommand | GlobalCommand | GlobalModifierCommand>,
   ): DefaultCompletionService {
     const service = new DefaultCompletionService();
     const registry = new DefaultCommandRegistry(commands);
@@ -81,11 +69,7 @@ describe("DefaultCompletionService", () => {
 
   test("returns empty completions if no registry set", async () => {
     const service = new DefaultCompletionService();
-    const result = await service.generateCompletions(
-      ShellType.BASH,
-      "mycli ",
-      6,
-    );
+    const result = await service.generateCompletions(ShellType.BASH, "mycli ", 6);
     expect(result).toEqual([]);
   });
 
@@ -96,11 +80,7 @@ describe("DefaultCompletionService", () => {
       makeSubCommand("run", "Run something"),
     ]);
 
-    const result = await service.generateCompletions(
-      ShellType.BASH,
-      "mycli h",
-      7,
-    );
+    const result = await service.generateCompletions(ShellType.BASH, "mycli h", 7);
     expect(result.length).toEqual(2);
     expect(result.map((r) => r.value)).toContain("help");
     expect(result.map((r) => r.value)).toContain("history");
@@ -112,11 +92,7 @@ describe("DefaultCompletionService", () => {
       makeSubCommand("run", "Run something"),
     ]);
 
-    const result = await service.generateCompletions(
-      ShellType.BASH,
-      "mycli ",
-      6,
-    );
+    const result = await service.generateCompletions(ShellType.BASH, "mycli ", 6);
     expect(result.map((r) => r.value)).toContain("help");
     expect(result.map((r) => r.value)).toContain("run");
   });
@@ -126,18 +102,10 @@ describe("DefaultCompletionService", () => {
       makeSubCommand("integration", "Install completion"),
       makeSubCommand("complete", "Generate completions"),
     ];
-    const group = makeGroupCommand(
-      "completions",
-      "Completion management",
-      members,
-    );
+    const group = makeGroupCommand("completions", "Completion management", members);
     const service = createService([group]);
 
-    const result = await service.generateCompletions(
-      ShellType.BASH,
-      "mycli comp",
-      10,
-    );
+    const result = await service.generateCompletions(ShellType.BASH, "mycli comp", 10);
     const values = result.map((r) => r.value);
     expect(values).toContain("completions");
     expect(values).toContain("completions:integration");
@@ -149,18 +117,10 @@ describe("DefaultCompletionService", () => {
       makeSubCommand("integration", "Install completion"),
       makeSubCommand("complete", "Generate completions"),
     ];
-    const group = makeGroupCommand(
-      "completions",
-      "Completion management",
-      members,
-    );
+    const group = makeGroupCommand("completions", "Completion management", members);
     const service = createService([group]);
 
-    const result = await service.generateCompletions(
-      ShellType.BASH,
-      "mycli completions:i",
-      19,
-    );
+    const result = await service.generateCompletions(ShellType.BASH, "mycli completions:i", 19);
     const values = result.map((r) => r.value);
     expect(values).toContain("completions:integration");
     expect(values).not.toContain("completions:complete");
@@ -184,11 +144,7 @@ describe("DefaultCompletionService", () => {
     ]);
     const service = createService([cmd]);
 
-    const result = await service.generateCompletions(
-      ShellType.BASH,
-      "mycli deploy --t",
-      16,
-    );
+    const result = await service.generateCompletions(ShellType.BASH, "mycli deploy --t", 16);
     const values = result.map((r) => r.value);
     expect(values).toContain("--target");
   });
@@ -205,29 +161,18 @@ describe("DefaultCompletionService", () => {
     ]);
     const service = createService([cmd]);
 
-    const result = await service.generateCompletions(
-      ShellType.BASH,
-      "mycli deploy --env st",
-      21,
-    );
+    const result = await service.generateCompletions(ShellType.BASH, "mycli deploy --env st", 21);
     const values = result.map((r) => r.value);
     expect(values).toContain("staging");
     expect(values).not.toContain("production");
   });
 
   test("completes global modifier commands with -- prefix", async () => {
-    const modifier = makeGlobalModifierCommand(
-      "verbose",
-      "Enable verbose output",
-    );
+    const modifier = makeGlobalModifierCommand("verbose", "Enable verbose output");
     const cmd = makeSubCommand("run", "Run something");
     const service = createService([modifier, cmd]);
 
-    const result = await service.generateCompletions(
-      ShellType.BASH,
-      "mycli --v",
-      9,
-    );
+    const result = await service.generateCompletions(ShellType.BASH, "mycli --v", 9);
     const values = result.map((r) => r.value);
     expect(values).toContain("--verbose");
   });
@@ -237,11 +182,7 @@ describe("DefaultCompletionService", () => {
     const cmd = makeSubCommand("run", "Run something");
     const service = createService([global, cmd]);
 
-    const result = await service.generateCompletions(
-      ShellType.BASH,
-      "mycli --ver",
-      11,
-    );
+    const result = await service.generateCompletions(ShellType.BASH, "mycli --ver", 11);
     const values = result.map((r) => r.value);
     expect(values).toContain("--version");
   });
@@ -268,10 +209,7 @@ describe("DefaultCompletionService", () => {
 
   test("parseCompletionContext delegates to shell handler", () => {
     const service = new DefaultCompletionService();
-    const result = service.parseCompletionContext(ShellType.BASH, [
-      "mycli help",
-      "10",
-    ]);
+    const result = service.parseCompletionContext(ShellType.BASH, ["mycli help", "10"]);
     expect(result.line).toEqual("mycli help");
     expect(result.cursorPosition).toEqual(10);
   });

package/tests/service/completion/shell/fish.test.ts

@@ -8,9 +8,7 @@ describe("FishShellHandler", () => {
 
   test("getDefaultConfigPath returns fish config.fish", () => {
     const configPath = handler.getDefaultConfigPath();
-    expect(configPath).toEndWith(
-      path.sep + path.join(".config", "fish", "config.fish"),
-    );
+    expect(configPath).toEndWith(path.sep + path.join(".config", "fish", "config.fish"));
   });
 
   test("getBootstrapScript generates correct complete command", () => {