fixed bugs

replit · Nov 6, 2023 · 6db6ac4 · 6db6ac4
1 parent f5a10a7
commit 6db6ac4
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 12 deletions.
diff --git a/modules/extensions/src/api/experimental/commands.ts b/modules/extensions/src/api/experimental/commands.ts
@@ -1,4 +1,4 @@
-import { extensionPort } from "../../util/comlink";
+import { extensionPort, proxy } from "../../util/comlink";
 import {
   CreateCommand,
   CommandProxy,
@@ -36,24 +36,25 @@ export interface AddCommandArgs {
  */
 export function add({ id, contributions, command }: AddCommandArgs) {
   if (typeof command === "function") {
-    let createCommand = async (cmdFnArgs: CommandFnArgs) => {
+    let createCommand = proxy(async (cmdFnArgs: CommandFnArgs) => {
       const cmd = await command(cmdFnArgs);
 
       if (!cmd) {
         return null;
       }
 
       return isCommandProxy(cmd) ? cmd : Command(cmd);
-    };
+    });
 
     extensionPort.experimental.commands.registerCreateCommand(
       { commandId: id, contributions },
       createCommand
     );
   } else {
-    let createCommand = async () => {
+    let createCommand = proxy(async () => {
       return isCommandProxy(command) ? command : Command(command);
-    };
+    });
+
     extensionPort.experimental.commands.registerCreateCommand(
       { commandId: id, contributions },
       createCommand
@@ -75,14 +76,13 @@ export function registerCreate(
   data: { commandId: string; contributions: Array<string> },
   createCommand: CreateCommand
 ): void {
-
   extensionPort.experimental.commands.registerCreateCommand(
     data,
     async (args: CommandFnArgs) => {
-      const cmd = await createCommand(args)
+      const cmd = await createCommand(args);
 
       if (!cmd) {
-        return null
+        return null;
       }
 
       return isCommandProxy(cmd) ? cmd : Command(cmd);

diff --git a/modules/extensions/src/commands/index.ts b/modules/extensions/src/commands/index.ts
@@ -38,7 +38,12 @@ export type CommandsFn = (
 
 export type CreateCommand = (
   args: CommandFnArgs
-) => CommandProxy | Promise<CommandProxy> | CommandArgs | Promise<CommandArgs> | null;
+) =>
+  | CommandProxy
+  | Promise<CommandProxy>
+  | CommandArgs
+  | Promise<CommandArgs>
+  | null;
 
 export type Run = () => any;
 
@@ -174,6 +179,11 @@ export function Command(cmdArgs: CommandArgs): CommandProxy {
         // Compute subcommands
         let subCmds = await commands(args);
 
+        // While we expect commands() to return an array, we don't want to throw an error if it doesn't.
+        if (!subCmds || !Array.isArray(subCmds)) {
+          return proxy([]);
+        }
+
         const commandProxyArray: Array<CommandProxy> = subCmds.map((subCmd) => {
           // Subcommands can be either a CommandArgs or a CommandProxy.
           // If it's already a wrapped command, just return it.
@@ -228,7 +238,5 @@ export type CommandProxy =
         description?: string;
         icon?: string;
       };
-      commands?: (
-        args: CommandFnArgs
-      ) => Promise<Array<CommandProxy>>;
+      commands?: (args: CommandFnArgs) => Promise<Array<CommandProxy>>;
     } & ProxyMarked & { [CommandSymbol]: true });