handle null case

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

Hide file tree

Showing 3 changed files with 20 additions and 11 deletions.
diff --git a/modules/extensions/src/api/experimental/commands.ts b/modules/extensions/src/api/experimental/commands.ts
@@ -39,6 +39,10 @@ export function add({ id, contributions, command }: AddCommandArgs) {
     let createCommand = async (cmdFnArgs: CommandFnArgs) => {
       const cmd = await command(cmdFnArgs);
 
+      if (!cmd) {
+        return null;
+      }
+
       return isCommandProxy(cmd) ? cmd : Command(cmd);
     };
 
@@ -71,8 +75,17 @@ export function registerCreate(
   data: { commandId: string; contributions: Array<string> },
   createCommand: CreateCommand
 ): void {
+
   extensionPort.experimental.commands.registerCreateCommand(
     data,
-    createCommand
+    async (args: CommandFnArgs) => {
+      const cmd = await createCommand(args)
+
+      if (!cmd) {
+        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,7 @@ export type CommandsFn = (
 
 export type CreateCommand = (
   args: CommandFnArgs
-) => CommandProxy | Promise<CommandProxy> | CommandArgs | Promise<CommandArgs>;
+) => CommandProxy | Promise<CommandProxy> | CommandArgs | Promise<CommandArgs> | null;
 
 export type Run = () => any;
 
@@ -214,25 +214,21 @@ export function Command(cmdArgs: CommandArgs): CommandProxy {
 export type CommandProxy =
   | ({
       data: {
-        type: string;
+        type: "action";
         label: string;
         description?: string;
         icon?: string;
       };
       run?: Run;
-      commands?: (
-        args: CommandFnArgs
-      ) => Promise<Array<CommandProxy | CommandArgs>>;
     } & ProxyMarked & { [CommandSymbol]: true })
   | ({
       data: {
-        type: string;
+        type: "context";
         label: string;
         description?: string;
         icon?: string;
       };
-      run?: Run;
       commands?: (
         args: CommandFnArgs
-      ) => Promise<Array<CommandProxy | CommandArgs>>;
-    } & ProxyMarked & { [CommandSymbol]: true })[];
+      ) => Promise<Array<CommandProxy>>;
+    } & ProxyMarked & { [CommandSymbol]: true });
diff --git a/modules/extensions/src/types/index.ts b/modules/extensions/src/types/index.ts
@@ -217,7 +217,7 @@ export type ExperimentalAPI = {
         commandId: string;
         contributions: Array<string>;
       },
-      create: CreateCommand
+      create: (createArgs: CommandFnArgs) => Promise<CommandProxy | null>
     ) => void;
   };
 };