Nits

ryangoree · Feb 5, 2024 · 1741d47 · 1741d47
1 parent 35f42d3
commit 1741d47
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/notes/terminal.png b/notes/terminal.png
diff --git a/packages/clide-js/src/core/command.ts b/packages/clide-js/src/core/command.ts
@@ -69,12 +69,16 @@ export function command<
   // Apply defaults
   requiresSubcommand = false,
   isMiddleware = true,
-  ...rest
+  options = {} as TOptions,
+  handler,
+  description = '',
 }: CommandModule<TData, TOptions>) {
   let mod = {
     requiresSubcommand,
     isMiddleware,
-    ...rest,
+    options,
+    handler,
+    description,
   };
 
   if (!mod.handler) {

diff --git a/packages/clide-js/src/core/context.ts b/packages/clide-js/src/core/context.ts
@@ -352,6 +352,7 @@ export class Context<TOptions extends OptionsConfig = OptionsConfig> {
   }: {
     commands: (CommandModule<any, any> | ResolvedCommand)[];
     initialData?: any;
+    // TODO: strict type for optionValues and paramValues
     optionValues?: OptionValues;
     paramValues?: Record<string, any>;
   }) => {
@@ -388,7 +389,10 @@ export class Context<TOptions extends OptionsConfig = OptionsConfig> {
         ...this.options,
         ...resolvedCommandsOptions,
       },
-      optionValues,
+      optionValues: {
+        ...this.parsedOptions,
+        ...optionValues,
+      },
     });
 
     try {